NullPointer fixes, updates notify