Removing whitespace.
Improving error message.