Remove unneccessary null check