diff --git a/message_handler.cpp b/message_handler.cpp
index f5c4a1b..b7365bb 100644
--- a/message_handler.cpp
+++ b/message_handler.cpp
@@ -57,7 +57,7 @@
     try
     {
 #ifdef RMCP_PING
-        if (ClassOfMsg::ASF == inMessage->rmcpMsgClass)
+        if (inMessage && (ClassOfMsg::ASF == inMessage->rmcpMsgClass))
         {
             sendASF();
         }
@@ -93,7 +93,7 @@
 
 #ifdef RMCP_PING
     // Execute the Command, possibly asynchronously
-    if (ClassOfMsg::ASF != inMessage->rmcpMsgClass)
+    if (inMessage && (ClassOfMsg::ASF != inMessage->rmcpMsgClass))
 #endif // RMCP_PING
     {
         updSessionData(inMessage);