Removed unneccessary null conditions