Fixes NullPointerException during update. Fixes #1484

You just want to catch null pointer exception?  Also, maybe you should log the exception.