Remove error-prone code line?