Bug fix---fix error handling.

Intead of just aborting the execution, return an error message instead.
Comment fix---make it match reality.
Remove extraneous blank line.