diff --git a/src/eepp/graphics/fonttruetype.cpp b/src/eepp/graphics/fonttruetype.cpp
index 4dd2ff6be..62d3ab510 100644
--- a/src/eepp/graphics/fonttruetype.cpp
+++ b/src/eepp/graphics/fonttruetype.cpp
@@ -633,7 +633,7 @@ FontTrueType::Page::Page() :
 }
 
 FontTrueType::Page::~Page() {
-	if ( NULL != texture )
+	if ( NULL != texture && TextureFactory::existsSingleton() )
 		TextureFactory::instance()->remove( texture->getId() );
 }
 
diff --git a/src/eepp/window/engine.cpp b/src/eepp/window/engine.cpp
index 21aeafa1a..e6ce1fd00 100755
--- a/src/eepp/window/engine.cpp
+++ b/src/eepp/window/engine.cpp
@@ -53,12 +53,12 @@ Engine::~Engine() {
 
 	GlobalBatchRenderer::destroySingleton();
 
-	TextureFactory::destroySingleton();
-
 	TextureAtlasManager::destroySingleton();
 
 	FontManager::destroySingleton();
 
+	TextureFactory::destroySingleton();
+
 	UI::UIManager::destroySingleton();
 
 	Graphics::cGL::destroySingleton();