* fix preserve_on_error AttributeError
* fix copy/paste error
Merge pull request #120 from coryb/fixup1

fix preserve_on_error AttributeError, copy/paste error