Minor bug, need to check if message is defined, not if it's nil