#95: fixed nullpointer exception