Added catch for the BadResponseException
Merge branch 'master' into jcid