splitted ambiguous errors code, and fixed spare bugs
Merge pull request #138 from globaleaks/issue/357

splitted ambiguous errors code, and fixed spare bugs