Change: Replaced catch-all exceptions with precise ones