Fixing NPE in tandem mappings.