Add in extra null check