diff --git a/config/config.go b/config/config.go
index f1907edf1..a69166c31 100644
--- a/config/config.go
+++ b/config/config.go
@@ -51,7 +51,9 @@ func Load(filename string) (*Config, error) {
 
 	// if nothing is there, write first config file.
 	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		WriteFile(filename, []byte(defaultConfigFile))
+		if err := WriteFile(filename, []byte(defaultConfigFile)); err != nil {
+			return nil, err
+		}
 	}
 
 	var cfg Config
diff --git a/config/config_test.go b/config/config_test.go
index 0b79673b5..ffc7ef7af 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -7,7 +7,7 @@ import (
 
 func TestConfig(t *testing.T) {
 
-	cfg, err := Load("")
+	cfg, err := Load(".ipfsconfig")
 	if err != nil {
 		t.Error(err)
 		return