diff --git a/include/Nazara/Utility/BufferMapper.inl b/include/Nazara/Utility/BufferMapper.inl
index 437a42e58..d3390cf19 100644
--- a/include/Nazara/Utility/BufferMapper.inl
+++ b/include/Nazara/Utility/BufferMapper.inl
@@ -70,8 +70,11 @@ void* NzBufferMapper<T>::GetPointer() const
 template<typename T>
 void NzBufferMapper<T>::Unmap()
 {
-	m_buffer->Unmap();
-	m_buffer = nullptr;
+	if (m_buffer)
+	{
+		m_buffer->Unmap();
+		m_buffer = nullptr;
+	}
 }
 
 #include <Nazara/Core/DebugOff.hpp>