-#33 - Fixes InvocationTargetException when using CompositeService. When CompositeService is being used, the exception gets wrapped 2 times. Changing the if to while when unwrapping causes the exception to be well unwrapped.