Improve exception message

Change-Id: I17bf483433e528b0a52c31d0b2cb1cd6e6c56a86