Removing whitespace.
Improving error messages.