[FEATURE] Improve meaning of exception message

Change-Id: Ifb11825afd1477343692f2cafd03b2aed43ccf36