interim changes prior to adding different error handling
changes to the way errors are handled