MB-7236: Give more apprpriate error msg

Change-Id: I5b93cdf49c1823fbf19ddd71dddb164a83c5ce2a
Merge "MB-7236: Give more apprpriate error msg"