Updated calls to accurately check for messages.

USERGRID-1768