Minor refactorings

superfluous throw/catch/re-throw