MT#9177 Fix stray key on non-existent column

Change-Id: Ie820ea54c2c096340ffb648aea14141b289464de