Great :)

The checkstyle fix and the exception handler are pushed.