diff --git a/src/app_layout.cpp b/src/app_layout.cpp
index 1f9429c..0d1f272 100644
--- a/src/app_layout.cpp
+++ b/src/app_layout.cpp
@@ -404,36 +404,42 @@ void App::init_menu_file()
                 popup->mouse_release();
                 popup->destroy();
             };
-            popup->find<NodeButtonCustom>("file-save-as")->on_click = [this](Node*) {
-                dialog_save();
-                popup->mouse_release();
-                popup->destroy();
-            };
-            popup->find<NodeButtonCustom>("file-save-ver")->on_click = [this](Node*) {
-                ui::Canvas::I->m_newdoc ? dialog_save() : dialog_save_ver();
-                popup->mouse_release();
-                popup->destroy();
-            };
-            popup->find<NodeButtonCustom>("file-export")->on_click = [this](Node*) {
-                dialog_export();
-                popup->mouse_release();
-                popup->destroy();
-            };
-			popup->find<NodeButtonCustom>("file-export-cubes")->on_click = [this](Node*) {
-				dialog_export_cubes();
-				popup->mouse_release();
-				popup->destroy();
-			};
-			popup->find<NodeButtonCustom>("file-cloud-upload")->on_click = [this](Node*) {
-                cloud_upload();
-                popup->mouse_release();
-                popup->destroy();
-            };
-            popup->find<NodeButtonCustom>("file-cloud-browse")->on_click = [this](Node*) {
-                cloud_browse();
-                popup->mouse_release();
-                popup->destroy();
-            };
+            if (auto b = popup->find<NodeButtonCustom>("file-save-as"))
+                b->on_click = [this](Node*) {
+                    dialog_save();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+            if (auto b = popup->find<NodeButtonCustom>("file-save-ver"))
+                b->on_click = [this](Node*) {
+                    ui::Canvas::I->m_newdoc ? dialog_save() : dialog_save_ver();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+            if (auto b = popup->find<NodeButtonCustom>("file-export"))
+                b->on_click = [this](Node*) {
+                    dialog_export();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+			if (auto b = popup->find<NodeButtonCustom>("file-export-cubes"))
+                b->on_click = [this](Node*) {
+                    dialog_export_cubes();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+			if (auto b = popup->find<NodeButtonCustom>("file-cloud-upload"))
+                b->on_click = [this](Node*) {
+                    cloud_upload();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+            if (auto b = popup->find<NodeButtonCustom>("file-cloud-browse"))
+                b->on_click = [this](Node*) {
+                    cloud_browse();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
         };
     }
 }