handle nil error return (re: go issue 6871 (temp fix Brad Fitz))