Add cinder check to support NoneType object