Removed some unnecessary semi-colons.
Wrap error-like objects into errors.