Misc 2 1 1

- Changed handling of errors
- Removed dependency on broken WADL client