Merge pull request #162 from chris-allan/error-handling

Error handling, test expansion and general fixes
merge master -D org: PR 159 (Tag release prefix)
merge master -D org

Repository: openmicroscopy/snoopycrimecop
Already up-to-date.

Merged PRs:
  # PR 159 sbesson 'Tag release prefix'

Generated by SCC-merge#309 (http://ci.openmicroscopy.org/job/SCC-merge/309/)