diff --git a/src/Nazara/Renderer/Context.cpp b/src/Nazara/Renderer/Context.cpp
index c8a6da370..031e9b780 100644
--- a/src/Nazara/Renderer/Context.cpp
+++ b/src/Nazara/Renderer/Context.cpp
@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Renderer/Context.hpp>
+#include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/StringStream.hpp>
@@ -149,14 +150,13 @@ bool NzContext::Create(const NzContextParameters& parameters)
 		return false;
 	}
 
+	m_impl = impl.release();
+
+	NzCallOnExit onExit([this] () { Destroy(); });
+
 	if (!SetActive(true))
 	{
 		NazaraError("Failed to activate context");
-
-		m_impl->Destroy();
-		delete m_impl;
-		m_impl = nullptr;
-
 		return false;
 	}
 
@@ -172,6 +172,8 @@ bool NzContext::Create(const NzContextParameters& parameters)
 		#endif
 	}
 
+	onExit.Reset();
+
 	NotifyCreated();
 
 	return true;