missing recycle call, catch possible exception when unregistering

Change-Id: Id8d5ff359fc7b2f90b3188e593edc5948c58df74