Better exception handling

Re-throw the same exception to preserve the stack trace