Adds additional error condition parsing and tests