diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index ba3d989703..d309637d42 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -455,7 +455,8 @@ void NativeInitGraphics() {
 	uiContext = new UIContext();
 	uiContext->theme = &ui_theme;
 	uiContext->Init(UIShader_Get(), UIShader_GetPlain(), uiTexture, &ui_draw2d, &ui_draw2d_front);
-	uiContext->Text()->SetFont("Tahoma", 20, 0);
+	if (uiContext->Text())
+		uiContext->Text()->SetFont("Tahoma", 20, 0);
 	screenManager->setUIContext(uiContext);
 
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -551,7 +552,8 @@ void NativeRender() {
 	glUniformMatrix4fv(UIShader_Get()->u_worldviewproj, 1, GL_FALSE, ortho.getReadPtr());
 
 	screenManager->render();
-	screenManager->getUIContext()->Text()->OncePerFrame();
+	if (screenManager->getUIContext()->Text())
+		screenManager->getUIContext()->Text()->OncePerFrame();
 
 	if (g_TakeScreenshot) {
 		TakeScreenshot();
diff --git a/native b/native
index b505648c99..ed48ad9c22 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit b505648c9920659868fff62aba64d68d06895a5b
+Subproject commit ed48ad9c223794126939bfdd8a1b5a0023096a9c