Change from pop to keys for reporting proper error message

Change from pop to keys for reporting proper error message #2752