diff --git a/Godeps b/Godeps
index 8678576c8..5b9af0819 100644
--- a/Godeps
+++ b/Godeps
@@ -3,7 +3,7 @@ github.com/bitly/go-hostpool            58b95b10d6ca26723a7f46017b348653b825a8d6
 github.com/nsqio/go-nsq                 642a3f9935f12cb3b747294318d730f56f4c34b4 # v1.0.6-alpha
 github.com/bitly/go-simplejson          18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a
 github.com/bmizerany/perks/quantile     6cb9d9d729303ee2628580d9aec5db968da3a607
-github.com/mreiferson/go-options        7ae3226d3e1fa6a0548f73089c72c96c141f3b95
+github.com/mreiferson/go-options        2e28e74c79f31a5a0e807baad7f4429ea2703dcb
 github.com/golang/snappy                d9eb7a3d35ec988b8585d4a0068e462c27d28380
 github.com/bitly/timer_metrics          afad1794bb13e2a094720aeb27c088aa64564895
 github.com/blang/semver                 9bf7bff48b0388cb75991e58c6df7d13e982f1f2
diff --git a/nsqd/nsqd.go b/nsqd/nsqd.go
index 70dbd76ca..95b85bb79 100644
--- a/nsqd/nsqd.go
+++ b/nsqd/nsqd.go
@@ -444,7 +444,10 @@ func (n *NSQD) GetTopic(topicName string) *Topic {
 	// this makes sure that any message received is buffered to the right channels
 	lookupdHTTPAddrs := n.lookupdHTTPAddrs()
 	if len(lookupdHTTPAddrs) > 0 {
-		channelNames, _ := n.ci.GetLookupdTopicChannels(t.name, lookupdHTTPAddrs)
+		channelNames, err := n.ci.GetLookupdTopicChannels(t.name, lookupdHTTPAddrs)
+		if err != nil {
+			n.logf("WARNING: failed to query nsqlookupd for channels to pre-create for topic %s - %s", t.name, err)
+		}
 		for _, channelName := range channelNames {
 			if strings.HasSuffix(channelName, "#ephemeral") {
 				// we don't want to pre-create ephemeral channels