diff --git a/x/machine/keeper/query_get_machine_by_address.go b/x/machine/keeper/query_get_machine_by_address.go
index 13ed395..757da53 100644
--- a/x/machine/keeper/query_get_machine_by_address.go
+++ b/x/machine/keeper/query_get_machine_by_address.go
@@ -20,7 +20,7 @@ func (k Keeper) GetMachineByAddress(goCtx context.Context, req *types.QueryGetMa
 
 	machineIndex, found := k.GetMachineIndexByAddress(ctx, req.Address)
 	if !found {
-		return nil, status.Error(codes.NotFound, "machine not found")
+		return nil, status.Error(codes.NotFound, "machine not found by address: "+req.Address)
 	}
 
 	machine, found := k.GetMachine(ctx, machineIndex)
diff --git a/x/machine/keeper/query_get_machine_by_address_test.go b/x/machine/keeper/query_get_machine_by_address_test.go
index 6056f85..54db70a 100644
--- a/x/machine/keeper/query_get_machine_by_address_test.go
+++ b/x/machine/keeper/query_get_machine_by_address_test.go
@@ -29,7 +29,7 @@ func TestGetMachineByAddress(t *testing.T) {
 		}, {
 			desc:    "MachineNotFound",
 			request: &types.QueryGetMachineByAddressRequest{Address: "invalid address"},
-			err:     status.Error(codes.NotFound, "machine not found"),
+			err:     status.Error(codes.NotFound, "machine not found by address: invalid address"),
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
diff --git a/x/machine/keeper/query_get_machine_by_public_key.go b/x/machine/keeper/query_get_machine_by_public_key.go
index b5d485d..817e9d3 100644
--- a/x/machine/keeper/query_get_machine_by_public_key.go
+++ b/x/machine/keeper/query_get_machine_by_public_key.go
@@ -20,7 +20,7 @@ func (k Keeper) GetMachineByPublicKey(goCtx context.Context, req *types.QueryGet
 
 	machineIndex, found := k.GetMachineIndexByPubKey(ctx, req.PublicKey)
 	if !found {
-		return nil, status.Error(codes.NotFound, "machine not found")
+		return nil, status.Error(codes.NotFound, "machine not found by public key: "+req.PublicKey)
 	}
 
 	machine, found := k.GetMachine(ctx, machineIndex)
diff --git a/x/machine/keeper/query_get_machine_by_public_key_test.go b/x/machine/keeper/query_get_machine_by_public_key_test.go
index 5059aa2..de48db3 100644
--- a/x/machine/keeper/query_get_machine_by_public_key_test.go
+++ b/x/machine/keeper/query_get_machine_by_public_key_test.go
@@ -39,7 +39,7 @@ func TestGetMachineByPublicKey(t *testing.T) {
 		}, {
 			desc:    "MachineNotFound",
 			request: &types.QueryGetMachineByPublicKeyRequest{PublicKey: "invalid key"},
-			err:     status.Error(codes.NotFound, "machine not found"),
+			err:     status.Error(codes.NotFound, "machine not found by public key: invalid key"),
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
diff --git a/x/machine/keeper/query_get_trust_anchor_status.go b/x/machine/keeper/query_get_trust_anchor_status.go
index 32d4d61..bbde19f 100644
--- a/x/machine/keeper/query_get_trust_anchor_status.go
+++ b/x/machine/keeper/query_get_trust_anchor_status.go
@@ -20,7 +20,7 @@ func (k Keeper) GetTrustAnchorStatus(goCtx context.Context, req *types.QueryGetT
 
 	_, activated, found := k.GetTrustAnchor(ctx, req.Machineid)
 	if !found {
-		return nil, status.Error(codes.NotFound, "trust anchor not found")
+		return nil, status.Error(codes.NotFound, "trust anchor not found by machine id: "+req.Machineid)
 	}
 
 	return &types.QueryGetTrustAnchorStatusResponse{Machineid: req.Machineid, Isactivated: activated}, nil
diff --git a/x/machine/keeper/query_get_trust_anchor_status_test.go b/x/machine/keeper/query_get_trust_anchor_status_test.go
index 81e5559..657e42c 100644
--- a/x/machine/keeper/query_get_trust_anchor_status_test.go
+++ b/x/machine/keeper/query_get_trust_anchor_status_test.go
@@ -35,7 +35,7 @@ func TestGetTrustAnchorQuery(t *testing.T) {
 		{
 			desc:    "NotFound",
 			request: &types.QueryGetTrustAnchorStatusRequest{Machineid: "invalid MachineID"},
-			err:     status.Error(codes.NotFound, "trust anchor not found"),
+			err:     status.Error(codes.NotFound, "trust anchor not found by machine id: invalid MachineID"),
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {