diff and better error checking