Fix to http://jira.diamond.ac.uk/browse/SCI-1944
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Removed try{} catch{} as masks problem.