Include key in warning, #360