Fix missing key handling