- Added check for null message (thankyou, Sylfa)