CLOUDSTACK-6242: exception handling improvements

Signed-off-by: Daan Hoogland <daan@onecht.net>