handled the issues in service, changed one error message text