Updates to content and error handling.
Added some files to support error handling.