Made changes as per code review feedback

- Added the null or empty error message to the Resources file
#1265