Issue #81: updating catch block