prevent user mode raising KeyError
Merge branch 'dev'