Removed error message. Cleaned up some error reporting.

Main code rev. 1920