v1.9.1 - Avoid NullPointerException