Removed unecessary TODO
Fixed null in message variable