Better exception messages.
Fixed missing source identifier injection.
Improved test coverage.
Further improved test coverage.