Adjusted keyword error checking