OSGi/catalog improvements

Can we catch `Exception` instead of `Throwable`? Makes no behavioural difference, but is better practice where possible.