null check and added logo