nullpointer fix
merged