Removing white space.
Improving error messages.