Mode 2096 - Fixed additional NPE on restore

This should be merged after https://github.com/ModeShape/modeshape/pull/1002 because it relies on code changed by that.