Improve exception message #19