CLOUDIFY-2182 Added missing resources and caught MissingResourceException where needed.