Fixed the observer

Sometimes event was null so it didn't remove the events tied to that obj.