More attention to failure conditions when deploying keys