EUCA-8161
added another check for message==null