Left some merge lines in there. My fault. Still exists a null pointer