diff --git a/client/tx/tx.go b/client/tx/tx.go
index 21fa4c16f..7958122da 100644
--- a/client/tx/tx.go
+++ b/client/tx/tx.go
@@ -235,10 +235,13 @@ func BuildUnsignedTx(txf Factory, msgs ...sdk.Msg) (ClientTx, error) {
 
 	tx := txf.txGenerator.NewTx()
 	tx.SetFee(auth.NewStdFee(txf.gas, fees))
-	tx.SetMsgs(msgs...)
 	tx.SetMemo(txf.memo)
 	tx.SetSignatures()
 
+	if err := tx.SetMsgs(msgs...); err != nil {
+		return nil, err
+	}
+
 	return tx, nil
 }