Added rethrowException