diff --git a/include/Nazara/Utility/IndexBuffer.hpp b/include/Nazara/Utility/IndexBuffer.hpp
index 7b26d7c50..4a2d6e95f 100644
--- a/include/Nazara/Utility/IndexBuffer.hpp
+++ b/include/Nazara/Utility/IndexBuffer.hpp
@@ -37,7 +37,7 @@ class NAZARA_API NzIndexBuffer : public NzResource
 
 		bool SetStorage(nzBufferStorage storage);
 
-		bool Unmap() const;
+		void Unmap() const;
 
 	private:
 		NzBuffer* m_buffer;
diff --git a/include/Nazara/Utility/VertexBuffer.hpp b/include/Nazara/Utility/VertexBuffer.hpp
index baa71fca9..4b47e8849 100644
--- a/include/Nazara/Utility/VertexBuffer.hpp
+++ b/include/Nazara/Utility/VertexBuffer.hpp
@@ -37,7 +37,7 @@ class NAZARA_API NzVertexBuffer : public NzResource
 
 		bool SetStorage(nzBufferStorage storage);
 
-		bool Unmap() const;
+		void Unmap() const;
 
 	private:
 		NzBuffer* m_buffer;
diff --git a/src/Nazara/Renderer/DebugDrawer.cpp b/src/Nazara/Renderer/DebugDrawer.cpp
index 9a2a330b9..bc70d492c 100644
--- a/src/Nazara/Renderer/DebugDrawer.cpp
+++ b/src/Nazara/Renderer/DebugDrawer.cpp
@@ -122,8 +122,7 @@ void NzDebugDrawer::Draw(const NzCubef& cube)
 	vertex->position.Set(max.x, min.y, max.z);
 	vertex++;
 
-	if (!vertexBuffer->Unmap())
-		NazaraWarning("Failed to unmap buffer");
+	vertexBuffer->Unmap();
 
 	const NzShader* oldShader = NzRenderer::GetShader();
 
@@ -199,8 +198,7 @@ void NzDebugDrawer::Draw(const NzSkeleton* skeleton)
 		}
 	}
 
-	if (!vertexBuffer->Unmap())
-		NazaraWarning("Failed to unmap buffer");
+	vertexBuffer->Unmap();
 
 	if (vertexCount > 0)
 	{
diff --git a/src/Nazara/Utility/Buffer.cpp b/src/Nazara/Utility/Buffer.cpp
index 24183eda3..563160730 100644
--- a/src/Nazara/Utility/Buffer.cpp
+++ b/src/Nazara/Utility/Buffer.cpp
@@ -78,8 +78,7 @@ bool NzBuffer::CopyContent(NzBuffer& buffer)
 
 	bool r = Fill(ptr, 0, buffer.GetLength());
 
-	if (!buffer.Unmap())
-		NazaraWarning("Failed to unmap source buffer");
+	buffer.Unmap();
 
 	return r;
 }
@@ -324,7 +323,7 @@ void NzBuffer::Unmap() const
 	if (!m_impl)
 	{
 		NazaraError("Buffer not valid");
-		return false;
+		return;
 	}
 	#endif
 
diff --git a/src/Nazara/Utility/IndexBuffer.cpp b/src/Nazara/Utility/IndexBuffer.cpp
index 3cac64130..a6efdb0dc 100644
--- a/src/Nazara/Utility/IndexBuffer.cpp
+++ b/src/Nazara/Utility/IndexBuffer.cpp
@@ -217,15 +217,15 @@ bool NzIndexBuffer::SetStorage(nzBufferStorage storage)
 	return m_buffer->SetStorage(storage);
 }
 
-bool NzIndexBuffer::Unmap() const
+void NzIndexBuffer::Unmap() const
 {
 	#if NAZARA_UTILITY_SAFE
 	if (!m_buffer)
 	{
 		NazaraError("Impossible to unlock sequential buffers");
-		return false;
+		return;
 	}
 	#endif
 
-	return m_buffer->Unmap();
+	m_buffer->Unmap();
 }
diff --git a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp
index 1905ea306..35293b85f 100644
--- a/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp
+++ b/src/Nazara/Utility/Loaders/MD5Mesh/Parser.cpp
@@ -357,8 +357,7 @@ bool NzMD5MeshParser::Parse(NzMesh* mesh)
 				}
 			}
 
-			if (!indexBuffer->Unmap())
-				NazaraWarning("Failed to unmap index buffer");
+			indexBuffer->Unmap();
 
 			// Vertex buffer
 			std::unique_ptr<NzVertexBuffer> vertexBuffer(new NzVertexBuffer(NzMesh::GetDeclaration(), vertexCount, m_parameters.storage, nzBufferUsage_Dynamic));
diff --git a/src/Nazara/Utility/VertexBuffer.cpp b/src/Nazara/Utility/VertexBuffer.cpp
index 454a4e70a..5fe33a5cb 100644
--- a/src/Nazara/Utility/VertexBuffer.cpp
+++ b/src/Nazara/Utility/VertexBuffer.cpp
@@ -169,7 +169,7 @@ bool NzVertexBuffer::SetStorage(nzBufferStorage storage)
 	return m_buffer->SetStorage(storage);
 }
 
-bool NzVertexBuffer::Unmap() const
+void NzVertexBuffer::Unmap() const
 {
-	return m_buffer->Unmap();
+	m_buffer->Unmap();
 }