More improvements to error handling, fix bug with error level/every