o.csstudio.nams: Fixed error message?
Merge branch 'rel15x' of github.com:Desy-extern/cs-studio into rel15x