Fix: Incorrect exception caught