App save errors

Fixes #207
Fixes #206