CLOUDIFY-1470, Fixed null pointer
CLOUDIFY-1470, fixed null pointer