Fixes #75 - Prevent NullPointerException from Handlers