Updating error stuff ... still need to finish