No Null For You

Null pointer exception has been cleared on the MapEvent class