minor fixes to catalog and jclouds properties

With this fix the null check in the caller is not needed any more.