diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 1dc08b7a06..72a601cd20 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -243,6 +243,9 @@ QVector<JointState> Model::createJointStates(const FBXGeometry& geometry) {
 };
 
 void Model::initJointTransforms() {
+    if (!_geometry) {
+        return;
+    }
     const FBXGeometry& geometry = _geometry->getFBXGeometry();
     glm::mat4 parentTransform = glm::scale(_scale) * glm::translate(_offset) * geometry.offset;
     _rig->initJointTransforms(parentTransform);
@@ -424,6 +427,9 @@ bool Model::updateGeometry() {
 
         deleteGeometry();
         _dilatedTextures.clear();
+        if (!geometry) {
+            std::cout << "WARNING: no geometry in Model::updateGeometry\n";
+        }
         setGeometry(geometry);
 
         _meshGroupsKnown = false;