Add more tags to package.json
Fix incorrect error handling