Multi update/destroy catch
Code cleanup