Fixes NullPointerException during update. Fixes #1484

amended the commit and -f pushed with log.trace. See line 1299.