Adding more nil guards