Make fix more clear by removing try/catch block