diff --git a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
index 61f02e0103..e7ad4d046b 100644
--- a/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+++ b/src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
@@ -2210,7 +2210,7 @@ static switch_status_t chat_send(switch_event_t *message_event)
 		}
 	}
 
-	if (!strlen(hint)) {		//FIXME FIXME FIXME
+	if (hint==NULL || !strlen(hint)) {		//FIXME FIXME FIXME
 		hint = from;
 	}
 	if (to && (user = strdup(to))) {