Improve messages on in-place failure conditions