Move exceptions into the try-catch