Adjusted isError conditions