CLOUDIFY-1862 Fixed the NullPointerException.