diff --git a/doc/go-target.md b/doc/go-target.md
index 6de6db916..4f7e64e05 100644
--- a/doc/go-target.md
+++ b/doc/go-target.md
@@ -88,7 +88,7 @@ func (this *TreeShapeListener) EnterEveryRule(ctx antlr.ParserRuleContext) {
 }
 
 func main() {
-	input := antlr.NewFileStream(os.Args[1])
+	input, _ := antlr.NewFileStream(os.Args[1])
 	lexer := parser.NewJSONLexer(input)
 	stream := antlr.NewCommonTokenStream(lexer,0)
 	p := parser.NewJSONParser(stream)
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseGoTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseGoTest.java
index 762635bce..48791461f 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseGoTest.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseGoTest.java
@@ -674,6 +674,7 @@ public class BaseGoTest implements RuntimeTestSupport {
 				"import (\n"
 				+"	\"github.com/antlr/antlr4/runtime/Go/antlr\"\n"
 				+"	\"./parser\"\n"
+				+"	\"fmt\"\n"
 				+"	\"os\"\n"
 				+")\n"
 				+ "\n"
@@ -696,7 +697,11 @@ public class BaseGoTest implements RuntimeTestSupport {
 				+ "}\n"
 				+ "\n"
 				+ "func main() {\n"
-				+ "	input := antlr.NewFileStream(os.Args[1])\n"
+				+ "	input, err := antlr.NewFileStream(os.Args[1])\n"
+				+ "     if err != nil {\n"
+				+ "     	fmt.Printf(\"Failed to find file: %v\", err)\n"
+				+ "     	return\n"
+				+ "     }\n"
 				+ "	lexer := parser.New<lexerName>(input)\n"
 				+ "	stream := antlr.NewCommonTokenStream(lexer,0)\n"
 				+ "<createParser>"
@@ -734,7 +739,11 @@ public class BaseGoTest implements RuntimeTestSupport {
 				+ ")\n"
 				+ "\n"
 				+ "func main() {\n"
-				+ "	input := antlr.NewFileStream(os.Args[1])\n"
+				+ "	input, err := antlr.NewFileStream(os.Args[1])\n"
+				+ "     if err != nil {\n"
+				+ "     	fmt.Printf(\"Failed to find file: %v\", err)\n"
+				+ "     	return\n"
+				+ "     }\n"
 				+ "	lexer := parser.New<lexerName>(input)\n"
 				+ "	stream := antlr.NewCommonTokenStream(lexer,0)\n"
 				+ "	stream.Fill()\n"
diff --git a/runtime/Go/antlr/file_stream.go b/runtime/Go/antlr/file_stream.go
index 540cf5030..842170c08 100644
--- a/runtime/Go/antlr/file_stream.go
+++ b/runtime/Go/antlr/file_stream.go
@@ -28,9 +28,9 @@ func NewFileStream(fileName string) (*FileStream, error) {
 		return nil, err
 	}
 	defer f.Close()
-	err = io.Copy(buf, f)
+	_, err = io.Copy(buf, f)
 	if err != nil {
-		return nil, er
+		return nil, err
 	}
 
 	fs := new(FileStream)