diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp
index 49fc3a4..5e68a10 100644
--- a/src/Surfaces/SurfaceManagerGui.cpp
+++ b/src/Surfaces/SurfaceManagerGui.cpp
@@ -199,8 +199,10 @@ namespace ofx {
             textureEditor.stopDragJoints();
             
             // Check if surface has moved
-            if (!surfaceManager->getSelectedSurface()->getMoved()) {
-                _cmdManager->undo();
+            if (surfaceManager->getSelectedSurface()){
+                if (!surfaceManager->getSelectedSurface()->getMoved()) {
+                    _cmdManager->undo();
+                }
             }
             
         }