Fixes crashes on various platforms. LGTM=iant R=iant CC=golang-codereviews https://golang.org/cl/167880044
Attach a file by drag & drop or click to upload
