NullPointer fixes, updates notify
merge fix