3 files changed, 33 insertions, 15 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 98ac7eec85..bde0b4e898 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -850,16 +850,16 @@ struct _KeyCodeMap {
 static const _KeyCodeMap _keycodes[55] = {
 	{ '`', KEY_QUOTELEFT },
 	{ '~', KEY_ASCIITILDE },
-	{ '0', KEY_KP_0 },
-	{ '1', KEY_KP_1 },
-	{ '2', KEY_KP_2 },
-	{ '3', KEY_KP_3 },
-	{ '4', KEY_KP_4 },
-	{ '5', KEY_KP_5 },
-	{ '6', KEY_KP_6 },
-	{ '7', KEY_KP_7 },
-	{ '8', KEY_KP_8 },
-	{ '9', KEY_KP_9 },
+	{ '0', KEY_0 },
+	{ '1', KEY_1 },
+	{ '2', KEY_2 },
+	{ '3', KEY_3 },
+	{ '4', KEY_4 },
+	{ '5', KEY_5 },
+	{ '6', KEY_6 },
+	{ '7', KEY_7 },
+	{ '8', KEY_8 },
+	{ '9', KEY_9 },
 	{ '-', KEY_MINUS },
 	{ '_', KEY_UNDERSCORE },
 	{ '=', KEY_EQUAL },
@@ -2427,12 +2427,21 @@ void OS_OSX::run() {
 	//int frames=0;
 	//uint64_t frame=0;
 
-	while (!force_quit) {
+	bool quit = false;
 
-		process_events(); // get rid of pending events
-		joypad_osx->process_joypads();
-		if (Main::iteration() == true)
-			break;
+	while (!force_quit && !quit) {
+
+		@try {
+
+			process_events(); // get rid of pending events
+			joypad_osx->process_joypads();
+
+			if (Main::iteration() == true) {
+				quit = true;
+			}
+		} @catch (NSException *exception) {
+			ERR_PRINTS("NSException: " + String([exception reason].UTF8String));
+		}
 	};
 
 	main_loop->finish();
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp
index a8be4fbc35..3b1be780d4 100644
--- a/platform/server/os_server.cpp
+++ b/platform/server/os_server.cpp
@@ -30,6 +30,7 @@
 #include "os_server.h"
 #include "drivers/dummy/audio_driver_dummy.h"
 #include "drivers/dummy/rasterizer_dummy.h"
+#include "drivers/dummy/texture_loader_dummy.h"
 #include "print_string.h"
 #include "servers/visual/visual_server_raster.h"
 #include <stdio.h>
@@ -83,6 +84,9 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int
 
 	_ensure_user_data_dir();
 
+	resource_loader_dummy = memnew(ResourceFormatDummyTexture);
+	ResourceLoader::add_resource_format_loader(resource_loader_dummy);
+
 	return OK;
 }
 
@@ -99,6 +103,8 @@ void OS_Server::finalize() {
 
 	memdelete(power_manager);
 
+	memdelete(resource_loader_dummy);
+
 	args.clear();
 }
 
diff --git a/platform/server/os_server.h b/platform/server/os_server.h
index 2cc6f0c47e..f1a880ecc2 100644
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@@ -32,6 +32,7 @@
 
 #include "../x11/crash_handler_x11.h"
 #include "../x11/power_x11.h"
+#include "drivers/dummy/texture_loader_dummy.h"
 #include "drivers/rtaudio/audio_driver_rtaudio.h"
 #include "drivers/unix/os_unix.h"
 #include "main/input_default.h"
@@ -65,6 +66,8 @@ class OS_Server : public OS_Unix {
 
 	CrashHandler crash_handler;
 
+	ResourceFormatDummyTexture *resource_loader_dummy;
+
 protected:
 	virtual int get_video_driver_count() const;
 	virtual const char *get_video_driver_name(int p_driver) const;