Fixed possible NPE on Message dereference