Added basic error-checking before saving
Merge branch 'master' of ssh://github.com/nijave/apporchard