diff --git a/go/go.cc b/go/go.cc
index e0e84e3..7050acc 100644
--- a/go/go.cc
+++ b/go/go.cc
@@ -34,10 +34,8 @@
 
   if (args->relative_import_path != NULL)
     ::gogo->set_relative_import_path(args->relative_import_path);
-  if (args->check_divide_by_zero)
-    ::gogo->set_check_divide_by_zero(args->check_divide_by_zero);
-  if (args->check_divide_overflow)
-    ::gogo->set_check_divide_overflow(args->check_divide_overflow);
+  ::gogo->set_check_divide_by_zero(args->check_divide_by_zero);
+  ::gogo->set_check_divide_overflow(args->check_divide_overflow);
   if (args->compiling_runtime)
     ::gogo->set_compiling_runtime(args->compiling_runtime);
   if (args->c_header != NULL)
diff --git a/go/gogo.cc b/go/gogo.cc
index 28aaecf..50cb58c 100644
--- a/go/gogo.cc
+++ b/go/gogo.cc
@@ -50,6 +50,11 @@
     pkgpath_from_option_(false),
     prefix_from_option_(false),
     relative_import_path_(),
+    c_header_(),
+    check_divide_by_zero_(true),
+    check_divide_overflow_(true),
+    compiling_runtime_(false),
+    debug_escape_level_(0),
     verify_types_(),
     interface_types_(),
     specific_type_functions_(),