nullpointer bugfixes