diff --git a/htrace-htraced/go/src/org/apache/htrace/conf/config.go b/htrace-htraced/go/src/org/apache/htrace/conf/config.go
index cb1d8b4..24170b2 100644
--- a/htrace-htraced/go/src/org/apache/htrace/conf/config.go
+++ b/htrace-htraced/go/src/org/apache/htrace/conf/config.go
@@ -217,8 +217,8 @@
 
 // Get a string configuration key.
 func (cnf *Config) Get(key string) string {
-	ret := cnf.settings[key]
-	if ret != "" {
+	ret, hadKey := cnf.settings[key]
+	if hadKey {
 		return ret
 	}
 	return cnf.defaults[key]
diff --git a/htrace-htraced/go/src/org/apache/htrace/conf/config_test.go b/htrace-htraced/go/src/org/apache/htrace/conf/config_test.go
index 9059dad..a681136 100644
--- a/htrace-htraced/go/src/org/apache/htrace/conf/config_test.go
+++ b/htrace-htraced/go/src/org/apache/htrace/conf/config_test.go
@@ -30,7 +30,10 @@
 func TestParseArgV(t *testing.T) {
 	t.Parallel()
 	argv := []string{"-Dfoo=bar", "-Dbaz=123", "-DsillyMode", "-Dlog.path="}
-	bld := &Builder{Argv: argv}
+	bld := &Builder{Argv: argv,
+		Defaults:map[string]string {
+			"log.path": "/log/path/default",
+		}}
 	cnf, err := bld.Build()
 	if err != nil {
 		t.Fatal()