Adding check against null
Merge branch 'development' of https://github.com/ISA-tools/ISAcreator into development
Merge branch 'development' of https://github.com/ISA-tools/ISAcreator into development
Upgraded to scidata conf 1.2