diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index f8de7210ea..ef0911f673 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -468,8 +468,13 @@ void Model::clearShapes() {
 
 void Model::rebuildShapes() {
     clearShapes();
+    
+    if (!_geometry) {
+        return;
+    }
+    
     const FBXGeometry& geometry = _geometry->getFBXGeometry();
-
+    
     if (geometry.joints.isEmpty()) {
         return;
     }