Fix to use server error handling
Fix to use server error handling
Fix to use server error handling
Merge pull request #12 from ionux/master

Fix to use server error handling