Added more info to exception.

Merge please