fixed issue https://github.com/globaleaks/GlobaLeaks/issues/425
better fix to https://github.com/globaleaks/GlobaLeaks/issues/425
fixed issue https://github.com/globaleaks/GlobaLeaks/issues/436
minor fixes on error handling, closing: https://github.com/globaleaks/GLBackend/pull/124
Merge pull request #125 from globaleaks/issues/436

fixed issue https://github.com/globaleaks/GlobaLeaks/issues/436
Merge branch 'devel', remote-tracking branch 'origin'