adding some failure scenarios
Merge branch 'master' into gh-pages