Null check and change cloud name