Fix #11 NullPointerException