Further catch clean up