helpful error messages and key validation after modification
Merge branch 'feature/input-sanitizing' into develop