I got the same error on upgrading to 2.2. I commented out the "die" and it seemed to work for me as well. As you said though, don't know what else that may have damaged.
Hopefully Alex will jump in with some comments.
Hopefully Alex will jump in with some comments.