Merge "Adds exception throwing when Openstack services missing"