diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03b524c60c3f..ac2e8795efe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@ ENHANCEMENTS:
   not just `tcp://localhost:46657`
   - gives error message when running commands on an unitialized chain, rather
   than some unintelligable panic
+  - Add `--genesis` to init
+  - Example: `basecli init --node=localhost:46657 --genesis=$HOME/.basecoin/genesis.json`
 
 
 ## 0.6.0 (June 22, 2017)
diff --git a/cmd/basecli/commands/cmds.go b/cmd/basecli/commands/cmds.go
index e71a8a35fb48..ea5b814a674a 100644
--- a/cmd/basecli/commands/cmds.go
+++ b/cmd/basecli/commands/cmds.go
@@ -47,6 +47,9 @@ func init() {
 
 // runDemo is an example of how to make a tx
 func doSendTx(cmd *cobra.Command, args []string) error {
+	if err := commands.RequireInit(cmd); err != nil {
+		return err
+	}
 
 	// load data from json or flags
 	tx := new(btypes.SendTx)
diff --git a/cmd/basecli/commands/query.go b/cmd/basecli/commands/query.go
index ac17cbdd92c9..bae27a3473e2 100644
--- a/cmd/basecli/commands/query.go
+++ b/cmd/basecli/commands/query.go
@@ -6,6 +6,7 @@ import (
 
 	wire "github.com/tendermint/go-wire"
 	lc "github.com/tendermint/light-client"
+	lcmd "github.com/tendermint/light-client/commands"
 	proofcmd "github.com/tendermint/light-client/commands/proofs"
 	"github.com/tendermint/light-client/proofs"
 
@@ -19,6 +20,10 @@ var AccountQueryCmd = &cobra.Command{
 }
 
 func doAccountQuery(cmd *cobra.Command, args []string) error {
+	if err := lcmd.RequireInit(cmd); err != nil {
+		return err
+	}
+
 	addr, err := proofcmd.ParseHexKey(args, "address")
 	if err != nil {
 		return err
diff --git a/glide.lock b/glide.lock
index b78263ae601e..cc8a27e9cc69 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
 hash: 4cef4b780c9acbedce588a7221903fa1c63c2ddef1237522bcf6b045c35f9c56
-updated: 2017-06-26T17:17:15.64503878+02:00
+updated: 2017-06-26T17:36:35.75642408+02:00
 imports:
 - name: github.com/bgentry/speakeasy
   version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd
@@ -132,7 +132,7 @@ imports:
   - data
   - data/base58
 - name: github.com/tendermint/light-client
-  version: 76aeff9b049179b67e69805555c1dd1481c57781
+  version: 3d9d9b1a9cde59c8b72f5955e3686a17efe7f6f2
   subpackages:
   - certifiers
   - certifiers/client