diff --git a/SDK/include/NDK/Application.hpp b/SDK/include/NDK/Application.hpp
index 84b331e95..8c0eb18a9 100644
--- a/SDK/include/NDK/Application.hpp
+++ b/SDK/include/NDK/Application.hpp
@@ -88,7 +88,7 @@ namespace Ndk
 
 				NazaraSlot(Nz::EventHandler, OnEvent, eventSlot);
 				NazaraSlot(Nz::EventHandler, OnKeyPressed, keyPressedSlot);
-				NazaraSlot(Nz::EventHandler, OnResized, resizedSlot);
+				NazaraSlot(Nz::RenderTarget, OnRenderTargetSizeChange, resizedSlot);
 				NazaraSlot(Nz::Log, OnLogWrite, logSlot);
 			};
 
diff --git a/SDK/src/NDK/Application.cpp b/SDK/src/NDK/Application.cpp
index 8ecb5d454..68396f128 100644
--- a/SDK/src/NDK/Application.cpp
+++ b/SDK/src/NDK/Application.cpp
@@ -144,9 +144,16 @@ namespace Ndk
 	{
 		std::unique_ptr<ConsoleOverlay> overlay = std::make_unique<ConsoleOverlay>();
 
-		overlay->console = std::make_unique<Console>(*info.overlayWorld, Nz::Vector2f(Nz::Vector2ui(info.window->GetWidth(), info.window->GetHeight() / 4)), overlay->lua);
+		Nz::Vector2ui windowDimensions;
+		if (info.window->IsValid())
+			windowDimensions.Set(info.window->GetWidth(), info.window->GetHeight() / 4);
+		else
+			windowDimensions.MakeZero();
+
+		overlay->console = std::make_unique<Console>(*info.overlayWorld, Nz::Vector2f(windowDimensions), overlay->lua);
 		
 		Console& consoleRef = *overlay->console;
+
 		// Redirect logs toward the console
 		overlay->logSlot.Connect(Nz::Log::OnLogWrite, [&consoleRef] (const Nz::String& str)
 		{
@@ -201,9 +208,9 @@ namespace Ndk
 				consoleRef.Show(!consoleRef.IsVisible());
 		});
 
-		overlay->resizedSlot.Connect(eventHandler.OnResized, [&consoleRef] (const Nz::EventHandler*, const Nz::WindowEvent::SizeEvent& event)
+		overlay->resizedSlot.Connect(info.renderTarget->OnRenderTargetSizeChange, [&consoleRef] (const Nz::RenderTarget* renderTarget)
 		{
-			consoleRef.SetSize({float(event.width), event.height / 4.f});
+			consoleRef.SetSize({float(renderTarget->GetWidth()), renderTarget->GetHeight() / 4.f});
 		});
 
 		info.console = std::move(overlay);
diff --git a/src/Nazara/Utility/Window.cpp b/src/Nazara/Utility/Window.cpp
index 02ed0f40a..7ba78dcb9 100644
--- a/src/Nazara/Utility/Window.cpp
+++ b/src/Nazara/Utility/Window.cpp
@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Utility/Window.hpp>
+#include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Core/LockGuard.hpp>
@@ -60,25 +61,22 @@ namespace Nz
 		else if (style & WindowStyle_Closable || style & WindowStyle_Resizable)
 			style |= WindowStyle_Titlebar;
 
-		m_impl = new WindowImpl(this);
-		if (!m_impl->Create(mode, title, style))
+		std::unique_ptr<WindowImpl> impl = std::make_unique<WindowImpl>(this);
+		if (!impl->Create(mode, title, style))
 		{
 			NazaraError("Failed to create window implementation");
-			delete m_impl;
-			m_impl = nullptr;
-
 			return false;
 		}
 
+		m_impl = impl.release();
+		CallOnExit destroyOnFailure([this] () { Destroy(); });
+
 		m_closed = false;
 		m_ownsWindow = true;
 
 		if (!OnWindowCreated())
 		{
 			NazaraError("Failed to initialize window extension");
-			delete m_impl;
-			m_impl = nullptr;
-
 			return false;
 		}
 
@@ -93,6 +91,10 @@ namespace Nz
 		if (opened)
 			m_impl->SetPosition(position.x, position.y);
 
+		OnWindowResized();
+
+		destroyOnFailure.Reset();
+
 		return true;
 	}