diff --git a/core/core.go b/core/core.go
index f7bfb7757..db16a153f 100644
--- a/core/core.go
+++ b/core/core.go
@@ -26,6 +26,7 @@ import (
 
 	routing "github.com/jbenet/go-ipfs/routing"
 	dht "github.com/jbenet/go-ipfs/routing/dht"
+	kb "github.com/jbenet/go-ipfs/routing/kbucket"
 	offroute "github.com/jbenet/go-ipfs/routing/offline"
 
 	bstore "github.com/jbenet/go-ipfs/blocks/blockstore"
@@ -145,7 +146,7 @@ func NewIPFSNode(parent context.Context, option ConfigOption) (*IpfsNode, error)
 	// Setup the mutable ipns filesystem structure
 	if node.OnlineMode() {
 		fs, err := ipnsfs.NewFilesystem(ctx, node.DAG, node.Namesys, node.Pinning, node.PrivateKey)
-		if err != nil {
+		if err != nil && err != kb.ErrLookupFailure {
 			return nil, debugerror.Wrap(err)
 		}
 		node.IpnsFs = fs
diff --git a/routing/dht/lookup.go b/routing/dht/lookup.go
index 59ef3911f..1f01a082a 100644
--- a/routing/dht/lookup.go
+++ b/routing/dht/lookup.go
@@ -6,7 +6,6 @@ import (
 	peer "github.com/jbenet/go-ipfs/p2p/peer"
 	kb "github.com/jbenet/go-ipfs/routing/kbucket"
 	u "github.com/jbenet/go-ipfs/util"
-	errors "github.com/jbenet/go-ipfs/util/debugerror"
 	pset "github.com/jbenet/go-ipfs/util/peerset"
 )
 
@@ -26,7 +25,7 @@ func (dht *IpfsDHT) GetClosestPeers(ctx context.Context, key u.Key) (<-chan peer
 	e := log.EventBegin(ctx, "getClosestPeers", &key)
 	tablepeers := dht.routingTable.NearestPeers(kb.ConvertKey(key), AlphaValue)
 	if len(tablepeers) == 0 {
-		return nil, errors.Wrap(kb.ErrLookupFailure)
+		return nil, kb.ErrLookupFailure
 	}
 
 	out := make(chan peer.ID, KValue)