Should we make sure we are using this encoder in places where we handle Locations? I'm not clear how this if statement is being hit, though perhaps it should be!