Added existence checks and returns