diff --git a/include/Nazara/Network/UdpSocket.hpp b/include/Nazara/Network/UdpSocket.hpp
index e6470e365..3c4abdfe7 100644
--- a/include/Nazara/Network/UdpSocket.hpp
+++ b/include/Nazara/Network/UdpSocket.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Jérôme Leclercq
+// Copyright (C) 2017 Jérôme Leclercq
 // This file is part of the "Nazara Engine - Network module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
diff --git a/src/Nazara/Network/AbstractSocket.cpp b/src/Nazara/Network/AbstractSocket.cpp
index f562900d2..3b3d9cb56 100644
--- a/src/Nazara/Network/AbstractSocket.cpp
+++ b/src/Nazara/Network/AbstractSocket.cpp
@@ -117,8 +117,7 @@ namespace Nz
 	*/
 	std::size_t AbstractSocket::QueryReceiveBufferSize() const
 	{
-		if (m_handle == SocketImpl::InvalidHandle)
-			return 0;
+		NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Socket must be created first");
 
 		return SocketImpl::QueryReceiveBufferSize(m_handle);
 	}
@@ -129,8 +128,7 @@ namespace Nz
 	*/
 	std::size_t AbstractSocket::QuerySendBufferSize() const
 	{
-		if (m_handle == SocketImpl::InvalidHandle)
-			return 0;
+		NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Socket must be created first");
 
 		return SocketImpl::QuerySendBufferSize(m_handle);
 	}
@@ -142,8 +140,9 @@ namespace Nz
 	*/
 	void AbstractSocket::SetReceiveBufferSize(std::size_t size)
 	{
-		if (m_handle != SocketImpl::InvalidHandle)
-			SocketImpl::SetReceiveBufferSize(m_handle, size);
+		NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Socket must be created first");
+		
+		SocketImpl::SetReceiveBufferSize(m_handle, size);
 	}
 
 	/*!
@@ -153,8 +152,9 @@ namespace Nz
 	*/
 	void AbstractSocket::SetSendBufferSize(std::size_t size)
 	{
-		if (m_handle != SocketImpl::InvalidHandle)
-			SocketImpl::SetSendBufferSize(m_handle, size);
+		NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Socket must be created first");
+		
+		SocketImpl::SetSendBufferSize(m_handle, size);
 	}
 
 	/*!