Fix case for updating final objects.
Better error handling. (thanks Rick)