changed non-fatal error handling to use new error functions