Fix: try-catch should have enclosed return call