changed error handling to return a error message/object (with Franzi)
Merge branch 'master' of https://github.com/PlantSimLab/ADAM