maybe actually check for keyLocation

The deprecation warning seems to show up all the time...until you're looking for it... so debugging this one is fun. I *think* this takes care of it.