Refs #2511: Fixes NPE that could prevent mappings from being applied when restoring session

(cherry picked from commit a4c5015f4dfa6076e3791719af5b3ffbe7ba1f74)