Profile: null pointer problems fixed