diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
index 5ee868556fbea18c1d96cc193156cc0cc35ed799..507959a65d144e5b16c003790a2661d9dc6edbc2 100644
--- a/cmd/ipfs/init.go
+++ b/cmd/ipfs/init.go
@@ -71,7 +71,10 @@ func initCmd(c *commander.Command, inp []string) error {
 
 	cfg.Identity = new(config.Identity)
 	// This needs thought
-	cfg.Identity.Address = "/ip4/127.0.0.1/tcp/4001"
+	cfg.Identity.Address = "/ip4/127.0.0.1/tcp/5001"
+
+	// local RPC endpoint
+	cfg.RPCAddress = "/ip4/127.0.0.1/tcp/4001"
 
 	nbits, ok := c.Flag.Lookup("b").Value.Get().(int)
 	if !ok {
diff --git a/cmd/ipfs/mount_unix.go b/cmd/ipfs/mount_unix.go
index 56a802b5e5c06aaeec342060c95710feced029d2..0b35bfeaf9fe5aaeb165f954a91739d19fef7f5a 100644
--- a/cmd/ipfs/mount_unix.go
+++ b/cmd/ipfs/mount_unix.go
@@ -3,6 +3,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/gonuts/flag"
@@ -44,6 +45,11 @@ func mountCmd(c *commander.Command, inp []string) error {
 		return err
 	}
 
+	// launch the RPC endpoint.
+	if n.Config.RPCAddress == "" {
+		return errors.New("no config.RPCAddress endpoint supplied")
+	}
+
 	maddr, err := ma.NewMultiaddr(n.Config.RPCAddress)
 	if err != nil {
 		return err