Remove exception handling for now. It wasn't tested or necessarily correct anyway.