Remove some try/except/re-raise blocks (just let the original exception be the exception)
(#411)