Added null check for Cloud view