diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d66384d3..029067a0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ BREAKING CHANGES:
  - [types] `pubKey` -> `pub_key`
  - [types] `uint64` -> `int32` for `Header.num_txs` and `PartSetHeader.total`
  - [types] `uint64` -> `int64` for everything else
+ - [types] ResponseSetOption includes error code
  - [abci-cli] codes are printed as their number instead of a message, except for `code == 0`, which is still printed as `OK`
 
 FEATURES:
diff --git a/README.md b/README.md
index 83c4e33bb..46abcc4fd 100644
--- a/README.md
+++ b/README.md
@@ -160,6 +160,7 @@ Here, we describe the requests and responses as function arguments and return va
     * `Key (string)`: Key to set
     * `Value (string)`: Value to set for key
   * __Returns__:
+    * `Code (uint32)`: Response code
     * `Log (string)`: Debug or error message
   * __Usage__:<br/>
     Set application options.  E.g. Key="mode", Value="mempool" for a mempool connection, or Key="mode", Value="consensus" for a consensus connection.
diff --git a/cmd/abci-cli/abci-cli.go b/cmd/abci-cli/abci-cli.go
index 3ee454aa6..18437ff71 100644
--- a/cmd/abci-cli/abci-cli.go
+++ b/cmd/abci-cli/abci-cli.go
@@ -429,7 +429,8 @@ func cmdSetOption(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	printResponse(cmd, args, response{
-		Log: res.Log,
+		Code: res.Code,
+		Log:  res.Log,
 	})
 	return nil
 }
diff --git a/example/code/code.go b/example/code/code.go
index 94e9d015e..b7e37d366 100644
--- a/example/code/code.go
+++ b/example/code/code.go
@@ -6,4 +6,6 @@ const (
 	CodeTypeEncodingError uint32 = 1
 	CodeTypeBadNonce      uint32 = 2
 	CodeTypeUnauthorized  uint32 = 3
+
+	CodeTypeBadOption uint32 = 101
 )
diff --git a/example/counter/counter.go b/example/counter/counter.go
index 0978799e8..abd7bb183 100644
--- a/example/counter/counter.go
+++ b/example/counter/counter.go
@@ -29,8 +29,16 @@ func (app *CounterApplication) SetOption(req types.RequestSetOption) types.Respo
 	key, value := req.Key, req.Value
 	if key == "serial" && value == "on" {
 		app.serial = true
+	} else {
+		return types.ResponseSetOption{
+			Code: code.CodeTypeBadOption,
+			Log:  cmn.Fmt("Unknown key (%s) or value (%s)", key, value),
+		}
+	}
+
+	return types.ResponseSetOption{
+		Code: code.CodeTypeOK,
 	}
-	return types.ResponseSetOption{}
 }
 
 func (app *CounterApplication) DeliverTx(tx []byte) types.ResponseDeliverTx {
diff --git a/types/application.go b/types/application.go
index 6c0b8bd04..c8ea19c3a 100644
--- a/types/application.go
+++ b/types/application.go
@@ -42,7 +42,7 @@ func (BaseApplication) Info(req RequestInfo) ResponseInfo {
 }
 
 func (BaseApplication) SetOption(req RequestSetOption) ResponseSetOption {
-	return ResponseSetOption{}
+	return ResponseSetOption{Code: CodeTypeOK}
 }
 
 func (BaseApplication) DeliverTx(tx []byte) ResponseDeliverTx {
diff --git a/types/types.pb.go b/types/types.pb.go
index 9233a05c8..69777d6d5 100644
--- a/types/types.pb.go
+++ b/types/types.pb.go
@@ -1212,7 +1212,8 @@ func (m *ResponseInfo) GetLastBlockAppHash() []byte {
 }
 
 type ResponseSetOption struct {
-	Log string `protobuf:"bytes,1,opt,name=log,proto3" json:"log,omitempty"`
+	Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
+	Log  string `protobuf:"bytes,2,opt,name=log,proto3" json:"log,omitempty"`
 }
 
 func (m *ResponseSetOption) Reset()                    { *m = ResponseSetOption{} }
@@ -1220,6 +1221,13 @@ func (m *ResponseSetOption) String() string            { return proto.CompactTex
 func (*ResponseSetOption) ProtoMessage()               {}
 func (*ResponseSetOption) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{17} }
 
+func (m *ResponseSetOption) GetCode() uint32 {
+	if m != nil {
+		return m.Code
+	}
+	return 0
+}
+
 func (m *ResponseSetOption) GetLog() string {
 	if m != nil {
 		return m.Log
@@ -2059,101 +2067,101 @@ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) }
 var fileDescriptorTypes = []byte{
 	// 1554 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x98, 0xcb, 0x6e, 0xdb, 0x46,
-	0x17, 0xc7, 0x2d, 0x51, 0xd4, 0xe5, 0xf8, 0x26, 0x8f, 0xfd, 0x25, 0x8a, 0xb2, 0x88, 0x43, 0x20,
-	0x5f, 0xe4, 0x5c, 0xac, 0x7c, 0x0e, 0xf2, 0x21, 0x4e, 0x8a, 0x02, 0x56, 0x9c, 0x54, 0x42, 0x80,
-	0x34, 0x9d, 0x18, 0xd9, 0x0a, 0x94, 0x38, 0x92, 0x88, 0x48, 0x24, 0x43, 0x8e, 0x1c, 0xb9, 0xe8,
-	0x23, 0x64, 0xdf, 0x75, 0xbb, 0x29, 0xd0, 0x17, 0xe8, 0xb2, 0xbb, 0xa2, 0xcf, 0xd0, 0x45, 0x9e,
-	0xa5, 0x98, 0x33, 0xc3, 0xab, 0xc9, 0x2c, 0xb2, 0xc8, 0xc6, 0x98, 0xcb, 0xf9, 0x8f, 0xce, 0x0c,
-	0xcf, 0xfc, 0xce, 0x19, 0xc3, 0x0e, 0xbf, 0xf0, 0x58, 0xd0, 0xc5, 0xbf, 0x87, 0x9e, 0xef, 0x72,
-	0x97, 0xe8, 0xd8, 0x69, 0xdf, 0x9f, 0xda, 0x7c, 0xb6, 0x1c, 0x1d, 0x8e, 0xdd, 0x45, 0x77, 0xea,
-	0x4e, 0xdd, 0x2e, 0xce, 0x8e, 0x96, 0x13, 0xec, 0x61, 0x07, 0x5b, 0x52, 0x65, 0xfc, 0x55, 0x81,
-	0x1a, 0x65, 0xef, 0x97, 0x2c, 0xe0, 0xa4, 0x03, 0x15, 0x36, 0x9e, 0xb9, 0xad, 0xd2, 0x7e, 0xa9,
-	0xb3, 0x7e, 0x44, 0x0e, 0xe5, 0xea, 0x6a, 0xf6, 0xf9, 0x78, 0xe6, 0xf6, 0xd7, 0x28, 0x5a, 0x90,
-	0xbb, 0xa0, 0x4f, 0xe6, 0xcb, 0x60, 0xd6, 0x2a, 0xa3, 0xe9, 0x6e, 0xda, 0xf4, 0x85, 0x98, 0xea,
-	0xaf, 0x51, 0x69, 0x23, 0x96, 0xb5, 0x9d, 0x89, 0xdb, 0xd2, 0xf2, 0x96, 0x1d, 0x38, 0x13, 0x5c,
-	0x56, 0x58, 0x90, 0xc7, 0x00, 0x01, 0xe3, 0x43, 0xd7, 0xe3, 0xb6, 0xeb, 0xb4, 0x2a, 0x68, 0x7f,
-	0x35, 0x6d, 0xff, 0x86, 0xf1, 0xef, 0x71, 0xba, 0xbf, 0x46, 0x1b, 0x41, 0xd8, 0x11, 0x4a, 0x8b,
-	0xcd, 0xed, 0x73, 0xe6, 0x0f, 0xf9, 0xaa, 0xa5, 0xe7, 0x29, 0x4f, 0xe5, 0xfc, 0xd9, 0x4a, 0x28,
-	0xad, 0xb0, 0x43, 0x8e, 0xa0, 0x3e, 0x9e, 0xb1, 0xf1, 0x3b, 0xa1, 0xab, 0xa2, 0xee, 0x3f, 0x69,
-	0xdd, 0x33, 0x31, 0x8b, 0xaa, 0xda, 0x58, 0x36, 0xc9, 0x21, 0x54, 0xc7, 0xee, 0x62, 0x61, 0xf3,
-	0x56, 0x0d, 0x15, 0x7b, 0x19, 0x05, 0xce, 0xf5, 0xd7, 0xa8, 0xb2, 0x12, 0xc7, 0xf5, 0x7e, 0xc9,
-	0xfc, 0x8b, 0x56, 0x3d, 0xef, 0xb8, 0x7e, 0x10, 0x53, 0xe2, 0xb8, 0xd0, 0x46, 0x6c, 0xc5, 0x76,
-	0x6c, 0x3e, 0x1c, 0xcf, 0x4c, 0xdb, 0x69, 0x35, 0xf2, 0xb6, 0x32, 0x70, 0x6c, 0xfe, 0x4c, 0x4c,
-	0x8b, 0xad, 0xd8, 0x61, 0x87, 0x3c, 0x85, 0xf5, 0x11, 0x9b, 0xda, 0xce, 0x70, 0x34, 0x77, 0xc7,
-	0xef, 0x5a, 0x80, 0xd2, 0x56, 0x5a, 0xda, 0x13, 0x06, 0x3d, 0x31, 0xdf, 0x5f, 0xa3, 0x30, 0x8a,
-	0x7a, 0xe4, 0x11, 0x34, 0x98, 0x63, 0x29, 0xe9, 0x3a, 0x4a, 0xaf, 0x64, 0x22, 0xc0, 0xb1, 0x42,
-	0x61, 0x9d, 0xa9, 0x76, 0xaf, 0x06, 0xfa, 0xb9, 0x39, 0x5f, 0x32, 0xe3, 0x36, 0xac, 0x27, 0x22,
-	0x85, 0xb4, 0xa0, 0xb6, 0x60, 0x41, 0x60, 0x4e, 0x19, 0x86, 0x53, 0x83, 0x86, 0x5d, 0x63, 0x0b,
-	0x36, 0x92, 0x71, 0x92, 0x10, 0x8a, 0x58, 0x10, 0xc2, 0x73, 0xe6, 0x07, 0x22, 0x00, 0x94, 0x50,
-	0x75, 0x8d, 0x27, 0xd0, 0xcc, 0x06, 0x01, 0x69, 0x82, 0xf6, 0x8e, 0x5d, 0x28, 0x4b, 0xd1, 0x24,
-	0x7b, 0xca, 0x21, 0x0c, 0xcd, 0x06, 0x55, 0xde, 0x19, 0x91, 0x36, 0x0a, 0x03, 0xb2, 0x05, 0x65,
-	0xbe, 0x42, 0xe9, 0x06, 0x2d, 0xf3, 0x95, 0xb1, 0x0f, 0x5b, 0xe9, 0x4f, 0x7e, 0xc9, 0xc2, 0x8a,
-	0x5c, 0xc7, 0x6f, 0x46, 0x08, 0x54, 0x2c, 0x93, 0x9b, 0xca, 0x02, 0xdb, 0x62, 0xcc, 0x33, 0xf9,
-	0x4c, 0xfd, 0x3c, 0xb6, 0xc9, 0x15, 0xa8, 0xce, 0x98, 0x3d, 0x9d, 0x71, 0xbc, 0x03, 0x1a, 0x55,
-	0x3d, 0xe1, 0xab, 0xe7, 0xbb, 0xe7, 0x0c, 0x43, 0xbd, 0x4e, 0x65, 0xc7, 0xd8, 0x86, 0xcd, 0x54,
-	0x20, 0x19, 0xa7, 0x91, 0xf3, 0xd1, 0x87, 0x27, 0x0f, 0x00, 0xce, 0xcd, 0xb9, 0x6d, 0x99, 0xdc,
-	0xf5, 0x83, 0x56, 0x69, 0x5f, 0xeb, 0xac, 0x1f, 0x35, 0xd5, 0xf7, 0x7a, 0x1b, 0x4e, 0xd0, 0x84,
-	0x8d, 0xf1, 0x67, 0x09, 0x76, 0x2e, 0x05, 0x81, 0x70, 0x77, 0x66, 0x06, 0xb3, 0x70, 0x0b, 0xa2,
-	0x4d, 0x6e, 0x09, 0x77, 0x4d, 0x8b, 0xf9, 0xea, 0x7a, 0x6f, 0xaa, 0x75, 0xfb, 0x38, 0x48, 0xd5,
-	0x24, 0xb9, 0x0b, 0x3b, 0xe6, 0x28, 0x60, 0x0e, 0x1f, 0x26, 0x3c, 0xd1, 0xf6, 0xb5, 0x8e, 0x4e,
-	0x9b, 0x72, 0x22, 0x72, 0x24, 0x20, 0x3d, 0xd8, 0x1b, 0x5d, 0xfc, 0x68, 0x3a, 0xdc, 0x76, 0x58,
-	0xd2, 0xbe, 0x82, 0x9e, 0x6f, 0xab, 0x5f, 0x78, 0x7e, 0x6e, 0x5b, 0xcc, 0x19, 0x33, 0xba, 0x1b,
-	0x19, 0xc7, 0x6b, 0x18, 0x07, 0xb0, 0x9d, 0x09, 0xc5, 0xc4, 0xc9, 0x96, 0x92, 0x27, 0x6b, 0x7c,
-	0xd4, 0xa1, 0x4e, 0x59, 0xe0, 0xb9, 0x4e, 0xc0, 0xc8, 0x63, 0x68, 0xb0, 0xd5, 0x98, 0x49, 0xaa,
-	0x94, 0x32, 0xb7, 0x42, 0xda, 0x3c, 0x0f, 0xe7, 0xc5, 0x8d, 0x8a, 0x8c, 0xc9, 0x81, 0x22, 0x62,
-	0x16, 0x73, 0x4a, 0x94, 0x44, 0xe2, 0xbd, 0x10, 0x89, 0x5a, 0x06, 0x09, 0xd2, 0x36, 0xc3, 0xc4,
-	0x03, 0xc5, 0xc4, 0x4a, 0xee, 0xc2, 0x29, 0x28, 0x1e, 0xa7, 0xa0, 0xa8, 0xe7, 0xba, 0x5f, 0x40,
-	0xc5, 0xe3, 0x14, 0x15, 0xab, 0xb9, 0xd2, 0x02, 0x2c, 0x3e, 0x4c, 0x60, 0xb1, 0x96, 0xa1, 0x81,
-	0x14, 0xe6, 0x70, 0xb1, 0x1b, 0x71, 0xb1, 0x9e, 0x21, 0xa9, 0x92, 0x64, 0xc1, 0x78, 0x2f, 0x04,
-	0x63, 0x23, 0xf7, 0xd0, 0x32, 0x64, 0x3c, 0x4e, 0x91, 0x11, 0x72, 0xb7, 0x53, 0x80, 0xc6, 0x6f,
-	0xd2, 0x68, 0x94, 0x7c, 0xbb, 0x96, 0xd1, 0x16, 0xb2, 0xf1, 0xff, 0x49, 0x36, 0x6e, 0x64, 0x88,
-	0xac, 0x62, 0xe1, 0xb3, 0x70, 0x3c, 0x10, 0x57, 0x2f, 0x13, 0x69, 0xe2, 0xf6, 0x33, 0xdf, 0x77,
-	0x7d, 0x45, 0x2f, 0xd9, 0x31, 0x3a, 0x82, 0x31, 0x71, 0x7c, 0x7d, 0x06, 0xa4, 0xc8, 0x89, 0x44,
-	0x74, 0x19, 0x3f, 0x97, 0x62, 0x2d, 0xb2, 0x34, 0xc9, 0xa7, 0x86, 0xe2, 0x53, 0x82, 0xaf, 0xe5,
-	0x14, 0x5f, 0xc9, 0x1d, 0xd8, 0x99, 0x9b, 0x01, 0x97, 0xdb, 0x1c, 0xa6, 0x80, 0xb5, 0x2d, 0x26,
-	0xe4, 0xfe, 0x24, 0xb9, 0xee, 0xc3, 0x6e, 0xc2, 0xd6, 0xf4, 0xbc, 0x21, 0x52, 0xa4, 0x82, 0x14,
-	0x69, 0x46, 0xd6, 0x27, 0x9e, 0xd7, 0x37, 0x83, 0x99, 0x71, 0x2b, 0xde, 0x7f, 0x8a, 0xdd, 0x73,
-	0x77, 0x1a, 0xb2, 0x7b, 0xee, 0x4e, 0x8d, 0x5f, 0x4b, 0xb1, 0x5d, 0xcc, 0x69, 0x02, 0x95, 0xb1,
-	0x6b, 0xc9, 0xed, 0x6f, 0x52, 0x6c, 0x93, 0x53, 0xb5, 0x33, 0xb1, 0x85, 0x8d, 0xde, 0x83, 0xbf,
-	0x3f, 0xdd, 0x58, 0xfb, 0xe7, 0xd3, 0x8d, 0x4e, 0xa2, 0xf6, 0xe1, 0xcc, 0xb1, 0x98, 0xbf, 0xb0,
-	0x1d, 0xde, 0x9d, 0xba, 0xf7, 0x3f, 0xd8, 0x3e, 0xeb, 0x0a, 0xc5, 0x61, 0xef, 0x82, 0xb3, 0x40,
-	0x9d, 0x85, 0xf2, 0x40, 0x8b, 0x3c, 0x20, 0x37, 0xa1, 0xc2, 0xcd, 0x69, 0x88, 0xa5, 0x10, 0x7c,
-	0x2f, 0xdf, 0xbe, 0x36, 0x6d, 0x9f, 0xe2, 0x94, 0xf1, 0x4b, 0x49, 0x60, 0x28, 0x75, 0x07, 0xbe,
-	0xaa, 0x8b, 0x4d, 0xd0, 0xa6, 0x66, 0x80, 0x47, 0xad, 0x51, 0xd1, 0x14, 0x23, 0x13, 0xc6, 0x10,
-	0x0d, 0x1a, 0x15, 0x4d, 0xe3, 0x8f, 0x72, 0x1c, 0x1b, 0x51, 0xaa, 0xba, 0xe4, 0xe1, 0x1e, 0xe8,
-	0xb6, 0x63, 0xb1, 0x15, 0xba, 0xa8, 0x51, 0xd9, 0x21, 0x3d, 0x99, 0x52, 0xb5, 0x2f, 0x74, 0x1b,
-	0x93, 0xf0, 0x8b, 0x30, 0x09, 0x57, 0xbe, 0x70, 0x15, 0x29, 0x17, 0xeb, 0x78, 0xbe, 0xeb, 0x4e,
-	0x70, 0x6f, 0x5f, 0xb4, 0x0e, 0xca, 0x13, 0x69, 0xa2, 0x9a, 0x4a, 0xc0, 0xea, 0x74, 0x6b, 0x71,
-	0x08, 0xfe, 0x24, 0x8a, 0x80, 0x24, 0xad, 0xbe, 0xe6, 0xb7, 0x35, 0x76, 0xe3, 0xf8, 0x8f, 0x40,
-	0x66, 0xec, 0x01, 0xb9, 0x4c, 0x28, 0x59, 0x0d, 0xa5, 0xd9, 0x43, 0xfe, 0x0b, 0xba, 0x65, 0x4f,
-	0x26, 0xc5, 0xf5, 0x80, 0x9c, 0x36, 0x7e, 0x2b, 0x43, 0x55, 0x26, 0x73, 0x72, 0x4d, 0x70, 0xde,
-	0xb4, 0x9d, 0xa1, 0x6d, 0x85, 0x7c, 0xc1, 0xfe, 0xc0, 0x4a, 0x1c, 0x5a, 0x39, 0x75, 0x68, 0x04,
-	0x2a, 0xdc, 0x5e, 0x30, 0x85, 0x06, 0x6c, 0x93, 0xab, 0x50, 0x73, 0x96, 0x8b, 0x21, 0x5f, 0xc9,
-	0xc0, 0xd4, 0x69, 0xd5, 0x59, 0x2e, 0xce, 0x56, 0x01, 0x39, 0x82, 0xcd, 0x04, 0x28, 0x6c, 0x4b,
-	0x25, 0xb0, 0x2d, 0xe5, 0x1a, 0xfa, 0x3d, 0x38, 0xa5, 0xeb, 0x11, 0x32, 0x06, 0x16, 0xe9, 0x00,
-	0x12, 0x64, 0x28, 0x93, 0x84, 0x24, 0x4b, 0x15, 0xc9, 0xb2, 0x25, 0xc6, 0x55, 0x16, 0x11, 0x95,
-	0xca, 0x75, 0x68, 0x88, 0x93, 0x94, 0x26, 0x35, 0x34, 0xa9, 0x8b, 0x01, 0x9c, 0xbc, 0x0d, 0xdb,
-	0x71, 0xa1, 0x21, 0x4d, 0xea, 0x72, 0x95, 0x78, 0x18, 0x0d, 0xaf, 0x41, 0x3d, 0x22, 0x58, 0x03,
-	0x2d, 0x6a, 0xa6, 0x02, 0xd7, 0x00, 0x6a, 0xca, 0xc5, 0xdc, 0x4a, 0xe9, 0x0e, 0xe8, 0x9e, 0xe9,
-	0xf3, 0x40, 0x15, 0x08, 0x61, 0xfe, 0x7a, 0x6d, 0xfa, 0xa2, 0x46, 0x55, 0xf5, 0x92, 0x34, 0x31,
-	0x8e, 0x61, 0x33, 0x35, 0x2e, 0xae, 0x1f, 0x77, 0xb9, 0x39, 0xc7, 0x15, 0x75, 0x2a, 0x3b, 0xd1,
-	0xcf, 0x94, 0xe3, 0x9f, 0x31, 0x9e, 0x40, 0x23, 0xfa, 0x86, 0xe2, 0xa8, 0xbd, 0xe5, 0x68, 0x18,
-	0x96, 0xbd, 0x1b, 0xb4, 0xea, 0x2d, 0x47, 0x2f, 0x65, 0xe5, 0xeb, 0xb9, 0x1f, 0x54, 0xd5, 0xa6,
-	0x51, 0xd9, 0x31, 0x9e, 0x42, 0x3d, 0xac, 0xaa, 0x8a, 0xa5, 0x05, 0x9f, 0xda, 0xf8, 0xbd, 0x04,
-	0x55, 0x09, 0xbf, 0x9c, 0x4a, 0xfb, 0x7f, 0x58, 0x82, 0x2e, 0xd9, 0x50, 0x6c, 0x1a, 0x85, 0x5b,
-	0xd1, 0xeb, 0x4e, 0x8a, 0x0e, 0xcf, 0x2e, 0x3c, 0x46, 0x1b, 0x68, 0x25, 0x9a, 0xe4, 0x26, 0x6c,
-	0x48, 0x49, 0xc0, 0x7d, 0xdb, 0x09, 0x43, 0x7f, 0x1d, 0xc7, 0xde, 0xe0, 0x90, 0xf8, 0xa4, 0xd2,
-	0xc4, 0x76, 0xb8, 0x82, 0x5c, 0x1d, 0x07, 0x06, 0x0e, 0x37, 0xae, 0x43, 0x05, 0xd7, 0x01, 0xa8,
-	0xbe, 0x39, 0xa3, 0x83, 0x57, 0xdf, 0x35, 0xd7, 0x48, 0x0d, 0xb4, 0xc1, 0xab, 0xb3, 0x66, 0xe9,
-	0xe8, 0xa3, 0x0e, 0xdb, 0x27, 0xbd, 0x67, 0x83, 0x13, 0xcf, 0x9b, 0xdb, 0x63, 0x13, 0x73, 0x4c,
-	0x17, 0x2a, 0x98, 0x45, 0x73, 0x1e, 0xb3, 0xed, 0xbc, 0x72, 0x8e, 0x1c, 0x81, 0x8e, 0xc9, 0x94,
-	0xe4, 0xbd, 0x69, 0xdb, 0xb9, 0x55, 0x9d, 0xf8, 0x11, 0x99, 0x6e, 0x2f, 0x3f, 0x6d, 0xdb, 0x79,
-	0xa5, 0x1d, 0xf9, 0x16, 0x1a, 0x71, 0x1a, 0x2c, 0x7a, 0xe0, 0xb6, 0x0b, 0x8b, 0x3c, 0xa1, 0x8f,
-	0xd3, 0x63, 0xd1, 0x33, 0xb7, 0x5d, 0x58, 0xe9, 0x91, 0xc7, 0x50, 0x0b, 0x33, 0x57, 0xfe, 0x63,
-	0xb7, 0x5d, 0x50, 0xec, 0x89, 0xe3, 0x91, 0xf9, 0x24, 0xef, 0x0d, 0xdb, 0xce, 0xad, 0xdf, 0xc8,
-	0x23, 0xa8, 0x2a, 0x94, 0xe6, 0xbe, 0x93, 0xdb, 0xf9, 0x55, 0xa2, 0xd8, 0x64, 0xfc, 0xdc, 0x29,
-	0x7a, 0x00, 0xb7, 0x0b, 0xeb, 0x3f, 0x72, 0x02, 0x90, 0x78, 0xe7, 0x14, 0x3e, 0x83, 0xdb, 0xc5,
-	0x55, 0x20, 0x11, 0x77, 0x27, 0x7a, 0x69, 0xe4, 0x3f, 0x86, 0xdb, 0x45, 0x85, 0xe0, 0xa8, 0x8a,
-	0xff, 0x60, 0x79, 0xf8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x15, 0x2f, 0x59, 0xab, 0x11,
+	0x17, 0xc7, 0x2d, 0x51, 0xd4, 0xe5, 0xf8, 0x26, 0x8f, 0xfd, 0x25, 0x8a, 0xb2, 0x88, 0x43, 0xe0,
+	0x6b, 0xe4, 0x5c, 0xac, 0xd4, 0x41, 0x8a, 0x38, 0x29, 0x0a, 0x58, 0x71, 0x52, 0x09, 0x01, 0xd2,
+	0x74, 0x62, 0x64, 0x2b, 0x50, 0xe2, 0x48, 0x22, 0x22, 0x91, 0x0c, 0x39, 0x72, 0xe4, 0xa2, 0x8f,
+	0x90, 0x7d, 0xd7, 0xed, 0xa6, 0x40, 0x5f, 0xa0, 0xcb, 0xee, 0x8a, 0x3e, 0x43, 0x17, 0x79, 0x96,
+	0x62, 0xce, 0x0c, 0xaf, 0x26, 0xb3, 0xc8, 0x22, 0x1b, 0x63, 0x2e, 0xe7, 0x3f, 0x3a, 0x33, 0x3c,
+	0xf3, 0x3b, 0x67, 0x0c, 0x3b, 0xfc, 0xc2, 0x63, 0x41, 0x17, 0xff, 0x1e, 0x7a, 0xbe, 0xcb, 0x5d,
+	0xa2, 0x63, 0xa7, 0x7d, 0x6f, 0x6a, 0xf3, 0xd9, 0x72, 0x74, 0x38, 0x76, 0x17, 0xdd, 0xa9, 0x3b,
+	0x75, 0xbb, 0x38, 0x3b, 0x5a, 0x4e, 0xb0, 0x87, 0x1d, 0x6c, 0x49, 0x95, 0xf1, 0x77, 0x05, 0x6a,
+	0x94, 0xbd, 0x5b, 0xb2, 0x80, 0x93, 0x0e, 0x54, 0xd8, 0x78, 0xe6, 0xb6, 0x4a, 0xfb, 0xa5, 0xce,
+	0xfa, 0x11, 0x39, 0x94, 0xab, 0xab, 0xd9, 0x67, 0xe3, 0x99, 0xdb, 0x5f, 0xa3, 0x68, 0x41, 0xee,
+	0x80, 0x3e, 0x99, 0x2f, 0x83, 0x59, 0xab, 0x8c, 0xa6, 0xbb, 0x69, 0xd3, 0xe7, 0x62, 0xaa, 0xbf,
+	0x46, 0xa5, 0x8d, 0x58, 0xd6, 0x76, 0x26, 0x6e, 0x4b, 0xcb, 0x5b, 0x76, 0xe0, 0x4c, 0x70, 0x59,
+	0x61, 0x41, 0x1e, 0x01, 0x04, 0x8c, 0x0f, 0x5d, 0x8f, 0xdb, 0xae, 0xd3, 0xaa, 0xa0, 0xfd, 0xd5,
+	0xb4, 0xfd, 0x6b, 0xc6, 0x7f, 0xc0, 0xe9, 0xfe, 0x1a, 0x6d, 0x04, 0x61, 0x47, 0x28, 0x2d, 0x36,
+	0xb7, 0xcf, 0x99, 0x3f, 0xe4, 0xab, 0x96, 0x9e, 0xa7, 0x3c, 0x95, 0xf3, 0x67, 0x2b, 0xa1, 0xb4,
+	0xc2, 0x0e, 0x39, 0x82, 0xfa, 0x78, 0xc6, 0xc6, 0x6f, 0x85, 0xae, 0x8a, 0xba, 0xff, 0xa5, 0x75,
+	0x4f, 0xc5, 0x2c, 0xaa, 0x6a, 0x63, 0xd9, 0x24, 0x87, 0x50, 0x1d, 0xbb, 0x8b, 0x85, 0xcd, 0x5b,
+	0x35, 0x54, 0xec, 0x65, 0x14, 0x38, 0xd7, 0x5f, 0xa3, 0xca, 0x4a, 0x1c, 0xd7, 0xbb, 0x25, 0xf3,
+	0x2f, 0x5a, 0xf5, 0xbc, 0xe3, 0xfa, 0x51, 0x4c, 0x89, 0xe3, 0x42, 0x1b, 0xb1, 0x15, 0xdb, 0xb1,
+	0xf9, 0x70, 0x3c, 0x33, 0x6d, 0xa7, 0xd5, 0xc8, 0xdb, 0xca, 0xc0, 0xb1, 0xf9, 0x53, 0x31, 0x2d,
+	0xb6, 0x62, 0x87, 0x1d, 0xf2, 0x04, 0xd6, 0x47, 0x6c, 0x6a, 0x3b, 0xc3, 0xd1, 0xdc, 0x1d, 0xbf,
+	0x6d, 0x01, 0x4a, 0x5b, 0x69, 0x69, 0x4f, 0x18, 0xf4, 0xc4, 0x7c, 0x7f, 0x8d, 0xc2, 0x28, 0xea,
+	0x91, 0x87, 0xd0, 0x60, 0x8e, 0xa5, 0xa4, 0xeb, 0x28, 0xbd, 0x92, 0x89, 0x00, 0xc7, 0x0a, 0x85,
+	0x75, 0xa6, 0xda, 0xbd, 0x1a, 0xe8, 0xe7, 0xe6, 0x7c, 0xc9, 0x8c, 0x5b, 0xb0, 0x9e, 0x88, 0x14,
+	0xd2, 0x82, 0xda, 0x82, 0x05, 0x81, 0x39, 0x65, 0x18, 0x4e, 0x0d, 0x1a, 0x76, 0x8d, 0x2d, 0xd8,
+	0x48, 0xc6, 0x49, 0x42, 0x28, 0x62, 0x41, 0x08, 0xcf, 0x99, 0x1f, 0x88, 0x00, 0x50, 0x42, 0xd5,
+	0x35, 0x1e, 0x43, 0x33, 0x1b, 0x04, 0xa4, 0x09, 0xda, 0x5b, 0x76, 0xa1, 0x2c, 0x45, 0x93, 0xec,
+	0x29, 0x87, 0x30, 0x34, 0x1b, 0x54, 0x79, 0x67, 0x44, 0xda, 0x28, 0x0c, 0xc8, 0x16, 0x94, 0xf9,
+	0x0a, 0xa5, 0x1b, 0xb4, 0xcc, 0x57, 0xc6, 0x3e, 0x6c, 0xa5, 0x3f, 0xf9, 0x25, 0x0b, 0x2b, 0x72,
+	0x1d, 0xbf, 0x19, 0x21, 0x50, 0xb1, 0x4c, 0x6e, 0x2a, 0x0b, 0x6c, 0x8b, 0x31, 0xcf, 0xe4, 0x33,
+	0xf5, 0xf3, 0xd8, 0x26, 0x57, 0xa0, 0x3a, 0x63, 0xf6, 0x74, 0xc6, 0xf1, 0x0e, 0x68, 0x54, 0xf5,
+	0x84, 0xaf, 0x9e, 0xef, 0x9e, 0x33, 0x0c, 0xf5, 0x3a, 0x95, 0x1d, 0x63, 0x1b, 0x36, 0x53, 0x81,
+	0x64, 0x9c, 0x46, 0xce, 0x47, 0x1f, 0x9e, 0xdc, 0x07, 0x38, 0x37, 0xe7, 0xb6, 0x65, 0x72, 0xd7,
+	0x0f, 0x5a, 0xa5, 0x7d, 0xad, 0xb3, 0x7e, 0xd4, 0x54, 0xdf, 0xeb, 0x4d, 0x38, 0x41, 0x13, 0x36,
+	0xc6, 0x5f, 0x25, 0xd8, 0xb9, 0x14, 0x04, 0xc2, 0xdd, 0x99, 0x19, 0xcc, 0xc2, 0x2d, 0x88, 0x36,
+	0xf9, 0xbf, 0x70, 0xd7, 0xb4, 0x98, 0xaf, 0xae, 0xf7, 0xa6, 0x5a, 0xb7, 0x8f, 0x83, 0x54, 0x4d,
+	0x92, 0x3b, 0xb0, 0x63, 0x8e, 0x02, 0xe6, 0xf0, 0x61, 0xc2, 0x13, 0x6d, 0x5f, 0xeb, 0xe8, 0xb4,
+	0x29, 0x27, 0x22, 0x47, 0x02, 0xd2, 0x83, 0xbd, 0xd1, 0xc5, 0x4f, 0xa6, 0xc3, 0x6d, 0x87, 0x25,
+	0xed, 0x2b, 0xe8, 0xf9, 0xb6, 0xfa, 0x85, 0x67, 0xe7, 0xb6, 0xc5, 0x9c, 0x31, 0xa3, 0xbb, 0x91,
+	0x71, 0xbc, 0x86, 0x71, 0x00, 0xdb, 0x99, 0x50, 0x4c, 0x9c, 0x6c, 0x29, 0x79, 0xb2, 0xc6, 0x07,
+	0x1d, 0xea, 0x94, 0x05, 0x9e, 0xeb, 0x04, 0x8c, 0x3c, 0x82, 0x06, 0x5b, 0x8d, 0x99, 0xa4, 0x4a,
+	0x29, 0x73, 0x2b, 0xa4, 0xcd, 0xb3, 0x70, 0x5e, 0xdc, 0xa8, 0xc8, 0x98, 0x1c, 0x28, 0x22, 0x66,
+	0x31, 0xa7, 0x44, 0x49, 0x24, 0xde, 0x0d, 0x91, 0xa8, 0x65, 0x90, 0x20, 0x6d, 0x33, 0x4c, 0x3c,
+	0x50, 0x4c, 0xac, 0xe4, 0x2e, 0x9c, 0x82, 0xe2, 0x71, 0x0a, 0x8a, 0x7a, 0xae, 0xfb, 0x05, 0x54,
+	0x3c, 0x4e, 0x51, 0xb1, 0x9a, 0x2b, 0x2d, 0xc0, 0xe2, 0x83, 0x04, 0x16, 0x6b, 0x19, 0x1a, 0x48,
+	0x61, 0x0e, 0x17, 0xbb, 0x11, 0x17, 0xeb, 0x19, 0x92, 0x2a, 0x49, 0x16, 0x8c, 0x77, 0x43, 0x30,
+	0x36, 0x72, 0x0f, 0x2d, 0x43, 0xc6, 0xe3, 0x14, 0x19, 0x21, 0x77, 0x3b, 0x05, 0x68, 0xfc, 0x36,
+	0x8d, 0x46, 0xc9, 0xb7, 0x6b, 0x19, 0x6d, 0x21, 0x1b, 0xbf, 0x49, 0xb2, 0x71, 0x23, 0x43, 0x64,
+	0x15, 0x0b, 0x9f, 0x84, 0xe3, 0x81, 0xb8, 0x7a, 0x99, 0x48, 0x13, 0xb7, 0x9f, 0xf9, 0xbe, 0xeb,
+	0x2b, 0x7a, 0xc9, 0x8e, 0xd1, 0x11, 0x8c, 0x89, 0xe3, 0xeb, 0x13, 0x20, 0x45, 0x4e, 0x24, 0xa2,
+	0xcb, 0xf8, 0xa5, 0x14, 0x6b, 0x91, 0xa5, 0x49, 0x3e, 0x35, 0x14, 0x9f, 0x12, 0x7c, 0x2d, 0xa7,
+	0xf8, 0x4a, 0x6e, 0xc3, 0xce, 0xdc, 0x0c, 0xb8, 0xdc, 0xe6, 0x30, 0x05, 0xac, 0x6d, 0x31, 0x21,
+	0xf7, 0x27, 0xc9, 0x75, 0x0f, 0x76, 0x13, 0xb6, 0xa6, 0xe7, 0x0d, 0x91, 0x22, 0x15, 0xa4, 0x48,
+	0x33, 0xb2, 0x3e, 0xf1, 0xbc, 0xbe, 0x19, 0xcc, 0x8c, 0xe3, 0x78, 0xff, 0x31, 0xbb, 0x09, 0x54,
+	0xc6, 0xae, 0x25, 0xb7, 0xb5, 0x49, 0xb1, 0x2d, 0x78, 0x3e, 0x77, 0xa7, 0xca, 0x33, 0xd1, 0x34,
+	0x7e, 0x2b, 0xc5, 0xda, 0x98, 0xdd, 0x79, 0xda, 0x53, 0xb5, 0x5b, 0x21, 0xde, 0xe8, 0xdd, 0xff,
+	0xe7, 0xe3, 0x8d, 0xb5, 0x7f, 0x3f, 0xde, 0xe8, 0x24, 0xea, 0x21, 0xce, 0x1c, 0x8b, 0xf9, 0x0b,
+	0xdb, 0xe1, 0xdd, 0xa9, 0x7b, 0xef, 0xbd, 0xed, 0xb3, 0xae, 0x50, 0x1c, 0xf6, 0x2e, 0x38, 0x0b,
+	0xd4, 0xf9, 0x28, 0x0f, 0xb4, 0xc8, 0x03, 0x72, 0x13, 0x2a, 0xdc, 0x9c, 0x86, 0xa8, 0x0a, 0x61,
+	0xf8, 0xe2, 0xcd, 0x2b, 0xd3, 0xf6, 0x29, 0x4e, 0x19, 0xbf, 0x96, 0x04, 0x9a, 0x52, 0xf7, 0xe2,
+	0x8b, 0xba, 0xd8, 0x04, 0x6d, 0x6a, 0x06, 0x78, 0xfc, 0x1a, 0x15, 0x4d, 0x31, 0x32, 0x61, 0x0c,
+	0x71, 0xa1, 0x51, 0xd1, 0x34, 0xfe, 0x2c, 0xc7, 0xf1, 0x12, 0xa5, 0xaf, 0x4b, 0x1e, 0xee, 0x81,
+	0x6e, 0x3b, 0x16, 0x5b, 0xa1, 0x8b, 0x1a, 0x95, 0x1d, 0xd2, 0x93, 0x69, 0x56, 0xfb, 0x4c, 0xb7,
+	0x31, 0x31, 0x3f, 0x0f, 0x13, 0x73, 0xe5, 0x33, 0x57, 0x91, 0x72, 0xb1, 0x8e, 0xe7, 0xbb, 0xee,
+	0x04, 0xf7, 0xf6, 0x59, 0xeb, 0xa0, 0x3c, 0x91, 0x3a, 0xaa, 0xa9, 0xa4, 0xac, 0x4e, 0xb7, 0x16,
+	0x87, 0xe0, 0xcf, 0xa2, 0x30, 0x48, 0x12, 0xec, 0x4b, 0x7e, 0x5b, 0x63, 0x37, 0x8e, 0xff, 0x08,
+	0x6e, 0xc6, 0x1e, 0x90, 0xcb, 0xd4, 0x92, 0x15, 0x52, 0x9a, 0x47, 0xe4, 0x2b, 0xd0, 0x2d, 0x7b,
+	0x32, 0x29, 0xae, 0x11, 0xe4, 0xb4, 0xf1, 0x7b, 0x19, 0xaa, 0x32, 0xc1, 0x93, 0x6b, 0x82, 0xfd,
+	0xa6, 0xed, 0x0c, 0x6d, 0x2b, 0x64, 0x0e, 0xf6, 0x07, 0x56, 0xe2, 0xd0, 0xca, 0xa9, 0x43, 0x23,
+	0x50, 0xe1, 0xf6, 0x82, 0x29, 0x5c, 0x60, 0x9b, 0x5c, 0x85, 0x9a, 0xb3, 0x5c, 0x0c, 0xf9, 0x4a,
+	0x06, 0xa6, 0x4e, 0xab, 0xce, 0x72, 0x71, 0xb6, 0x0a, 0xc8, 0x11, 0x6c, 0x26, 0xe0, 0x61, 0x5b,
+	0x2a, 0xa9, 0x6d, 0x29, 0xd7, 0xd0, 0xef, 0xc1, 0x29, 0x5d, 0x8f, 0x30, 0x32, 0xb0, 0x48, 0x07,
+	0x90, 0x2a, 0x43, 0x99, 0x38, 0x24, 0x6d, 0xaa, 0x48, 0x9b, 0x2d, 0x31, 0xae, 0x32, 0x8b, 0xa8,
+	0x5e, 0xae, 0x43, 0x43, 0x9c, 0xa4, 0x34, 0xa9, 0xa1, 0x49, 0x5d, 0x0c, 0xe0, 0xe4, 0x2d, 0xd8,
+	0x8e, 0x8b, 0x0f, 0x69, 0x52, 0x97, 0xab, 0xc4, 0xc3, 0x68, 0x78, 0x0d, 0xea, 0x11, 0xd5, 0x1a,
+	0x68, 0x51, 0x33, 0x15, 0xcc, 0x06, 0x50, 0x53, 0x2e, 0xe6, 0x56, 0x4f, 0xb7, 0x41, 0xf7, 0x4c,
+	0x9f, 0x07, 0xaa, 0x68, 0x08, 0x73, 0xda, 0x2b, 0xd3, 0x17, 0x75, 0xab, 0xaa, 0xa1, 0xa4, 0x89,
+	0x71, 0x0c, 0x9b, 0xa9, 0x71, 0x71, 0xfd, 0xb8, 0xcb, 0xcd, 0x39, 0xae, 0xa8, 0x53, 0xd9, 0x89,
+	0x7e, 0xa6, 0x1c, 0xff, 0x8c, 0xf1, 0x18, 0x1a, 0xd1, 0x37, 0x14, 0x47, 0xed, 0x2d, 0x47, 0xc3,
+	0xb0, 0x14, 0xde, 0xa0, 0x55, 0x6f, 0x39, 0x7a, 0x21, 0xab, 0x61, 0xcf, 0x7d, 0xaf, 0x2a, 0x39,
+	0x8d, 0xca, 0x8e, 0xf1, 0x04, 0xea, 0x61, 0xa5, 0x55, 0x2c, 0x2d, 0xf8, 0xd4, 0xc6, 0x1f, 0x25,
+	0xa8, 0x4a, 0xf8, 0xe5, 0x54, 0xdf, 0x5f, 0x63, 0x59, 0xba, 0x64, 0x43, 0xb1, 0x69, 0x14, 0x6e,
+	0x45, 0x2f, 0x3e, 0x29, 0x3a, 0x3c, 0xbb, 0xf0, 0x18, 0x6d, 0xa0, 0x95, 0x68, 0x92, 0x9b, 0xb0,
+	0x21, 0x25, 0x01, 0xf7, 0x6d, 0x27, 0x0c, 0xfd, 0x75, 0x1c, 0x7b, 0x8d, 0x43, 0xe2, 0x93, 0x4a,
+	0x13, 0xdb, 0xe1, 0x0a, 0x72, 0x75, 0x1c, 0x18, 0x38, 0xdc, 0xb8, 0x0e, 0x15, 0x5c, 0x07, 0xa0,
+	0xfa, 0xfa, 0x8c, 0x0e, 0x5e, 0x7e, 0xdf, 0x5c, 0x23, 0x35, 0xd0, 0x06, 0x2f, 0xcf, 0x9a, 0xa5,
+	0xa3, 0x0f, 0x3a, 0x6c, 0x9f, 0xf4, 0x9e, 0x0e, 0x4e, 0x3c, 0x6f, 0x6e, 0x8f, 0x4d, 0xcc, 0x3b,
+	0x5d, 0xa8, 0x60, 0x66, 0xcd, 0x79, 0xe0, 0xb6, 0xf3, 0x4a, 0x3c, 0x72, 0x04, 0x3a, 0x26, 0x58,
+	0x92, 0xf7, 0xce, 0x6d, 0xe7, 0x56, 0x7a, 0xe2, 0x47, 0x64, 0x0a, 0xbe, 0xfc, 0xdc, 0x6d, 0xe7,
+	0x95, 0x7b, 0xe4, 0x3b, 0x68, 0xc4, 0xa9, 0xb1, 0xe8, 0xd1, 0xdb, 0x2e, 0x2c, 0xfc, 0x84, 0x3e,
+	0x4e, 0x8f, 0x45, 0x4f, 0xdf, 0x76, 0x61, 0xf5, 0x47, 0x1e, 0x41, 0x2d, 0xcc, 0x5c, 0xf9, 0x0f,
+	0xe0, 0x76, 0x41, 0x01, 0x28, 0x8e, 0x47, 0xe6, 0x93, 0xbc, 0x77, 0x6d, 0x3b, 0xb7, 0xa6, 0x23,
+	0x0f, 0xa1, 0xaa, 0x50, 0x9a, 0xfb, 0x76, 0x6e, 0xe7, 0x57, 0x8e, 0x62, 0x93, 0xf1, 0x13, 0xa8,
+	0xe8, 0x51, 0xdc, 0x2e, 0xac, 0x09, 0xc9, 0x09, 0x40, 0xe2, 0xed, 0x53, 0xf8, 0x34, 0x6e, 0x17,
+	0x57, 0x86, 0x44, 0xdc, 0x9d, 0xe8, 0xf5, 0x91, 0xff, 0x40, 0x6e, 0x17, 0x15, 0x87, 0xa3, 0x2a,
+	0xfe, 0xd3, 0xe5, 0xc1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0x4d, 0x6a, 0x92, 0xbf, 0x11,
 	0x00, 0x00,
 }
diff --git a/types/types.proto b/types/types.proto
index 2424474d3..516cca15b 100644
--- a/types/types.proto
+++ b/types/types.proto
@@ -114,7 +114,8 @@ message ResponseInfo {
 }
 
 message ResponseSetOption{
-  string log = 1;
+  uint32 code = 1;
+  string log  = 2;
 }
 
 message ResponseDeliverTx{