TFS: 39531 . Change the error message in admin site. added error handling and reporting. + minor fixes