fix check for no message