Update to ServiceManager to provide better location of which manager is actually causing the error
change of error name methodology
Merge branch 'hotfix/4129' into develop

Forward port #4129