Enhanced error message a bit.
Removed superflous check.