Fix for bug 308: When we have a state file we cannot parse, tell the user, and move it aside. svn:r8224