Correct error raising per feedback