diff --git a/include/sp/protocol/message/MessageDispatcherImpl.inl b/include/sp/protocol/message/MessageDispatcherImpl.inl
index 23e9a87..7319fbf 100644
--- a/include/sp/protocol/message/MessageDispatcherImpl.inl
+++ b/include/sp/protocol/message/MessageDispatcherImpl.inl
@@ -2,6 +2,7 @@
 
 template <typename MessageIdType, typename MessageBase, typename MessageHandler>
 void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::RegisterHandler(MessageIdType a_MessageType, MessageHandler* a_Handler) {
+	assert(a_Handler);
 	auto found = std::find(m_Handlers[a_MessageType].begin(), m_Handlers[a_MessageType].end(), a_Handler);
 	if (found == m_Handlers[a_MessageType].end())
 		m_Handlers[a_MessageType].push_back(a_Handler);
@@ -30,7 +31,6 @@ template <typename MessageIdType, typename MessageBase, typename MessageHandler>
 void MessageDispatcher<MessageIdType, MessageBase, MessageHandler>::Dispatch(const MessageBase& a_Message) {
 	MessageIdType type = a_Message.GetId();
 	for (auto& handler : m_Handlers[type]) {
-		if (handler)
-			a_Message.Dispatch(*handler);
+		a_Message.Dispatch(*handler);
 	}
 }