DEVIDM-94: Corrected some log and error messages
Merge pull request #29 from iceglow/DEVIDM-94

DEVIDM-94: Corrected some log and error messages