Sharvani|#56|Fixing error messages.