Standardize error. Initial round work.