try to append exception to returned deferred instead of just raising it
Merge pull request #4 from native2k/master

Error handling