Added NullPointerException handler (#215)