Removed possible NullPointerException during start