Minor, but can we switch this to == null