Fix derp patch application adding 'nil,' back to return in GOARCH check