Fixed an exception check on update.  Added some initial test cases.