diff --git a/src/gp2x/menu/menu_config.cpp b/src/gp2x/menu/menu_config.cpp
index 192fb32..ab3d90d 100755
--- a/src/gp2x/menu/menu_config.cpp
+++ b/src/gp2x/menu/menu_config.cpp
@@ -1147,6 +1147,8 @@ int saveconfig(int general)
 #else
         strcpy(buf, kbdvita_get("Enter config name:", "myconfig", 100, 0));
 #endif
+        if (buf[0] == 0)
+            return 0;
         snprintf(path, 300, "%s/conf/%s%s", launchDir, buf, ".conf");
 #else
         return 0;
diff --git a/src/gp2x/menu/menu_savestates.cpp b/src/gp2x/menu/menu_savestates.cpp
index 97dcce9..798af03 100755
--- a/src/gp2x/menu/menu_savestates.cpp
+++ b/src/gp2x/menu/menu_savestates.cpp
@@ -688,24 +688,26 @@ int run_menuSavestates()
 				break;
 			case SAVE_MENU_CASE_EXPORT_MEM:
 				{
-				make_savestate_filenames(savestate_filename,NULL);
-				FILE *source=fopen(savestate_filename,"rb");
-				if (source)
-				{
-					fclose(source);
+					make_savestate_filenames(savestate_filename,NULL);
+					FILE *source=fopen(savestate_filename,"rb");
+					if (source)
+					{
+						fclose(source);
 #if defined(__SWITCH__) || defined(__PSP2__)
-			        char buf[100] = "";
+				        char buf[100] = "";
 #ifdef __SWITCH__
-			        kbdswitch_get("Enter savestate name:", "mysavestate", 100, 0, buf);
+				        kbdswitch_get("Enter savestate name:", "mysavestate", 100, 0, buf);
 #else
-			        strcpy(buf, kbdvita_get("Enter savestate name:", "mysavestate", 100, 0));
+				        strcpy(buf, kbdvita_get("Enter savestate name:", "mysavestate", 100, 0));
 #endif
-					char save_export_filename[255] = "";
-			        snprintf(save_export_filename, 255, "%s%s%s", SAVE_PREFIX, buf, ".asf");
-					cp(savestate_filename, save_export_filename);
+						char save_export_filename[255] = "";
+						if (buf[0] != 0) {
+							snprintf(save_export_filename, 255, "%s%s%s", SAVE_PREFIX, buf, ".asf");
+							cp(savestate_filename, save_export_filename);
+						}
 #else
-					saveMenu_case=-1;
-					break;
+						saveMenu_case=-1;
+						break;
 #endif
 					}
 					else