Udpated catch, cleanup