Prevent NPE for text message as well