Merge pull request #24 from stylight/master

uploader module: Use api.Error instead of Exception