Catch some errors from Guzzle API
Merge branch 'develop' of github.com:unikent/of-course into develop