Check for null in another place in UpdateFromModel

This is another logical possible source of the crashing tests on
the build server.

Change-Id: Ifb994bfe9fa07fc5a3fd0ca8c8ba6ecb796f918f