small exception refactor
better message resolution strategy
new exception raising