Some basic error recovery.
Merge branch 'master' of https://github.com/Joe-Jones/logic