emergency fix nullpointer