Slight improvement for old error handling