Error improvements