Fix crashy unregister. Do not attempt to call nothing on a null object