diff --git a/handler/manage_device_key.go b/handler/manage_device_key.go
index 59b0e4e50611515b67d40c3cfe757cb0a742c9f0..7038e0b248c4cdb56b43e1d2d9a4f7b4eeb9b06e 100644
--- a/handler/manage_device_key.go
+++ b/handler/manage_device_key.go
@@ -100,7 +100,9 @@ func (s *KeyStorageServerImpl) updateAll(ctx context.Context, uuid string, updat
 	for _, kType := range []api.KeyType{api.KeyType_PRIVATE, api.KeyType_PUBLIC, api.KeyType_CERTIFICATE} {
 		err := updateKey(client, uuid, kType, updateFunc)
 		if err != nil {
-			return err
+			if !errors.Wraps(err, keyutils.ErrNoData) {
+				return err
+			}
 		}
 	}
 
diff --git a/utils/utils.go b/utils/utils.go
index a7697011f5da64b1be197c42f884b4990ac1e8d2..552d8459fe39a74aa37877582b1982616d0efa68 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -37,6 +37,8 @@ import (
 	"code.vereign.com/code/viam-apis/key-storage-agent/api"
 )
 
+var ErrNoData = errors.New("No data")
+
 func GenerateUnusedUUID(client *client.DataStorageClientImpl) (string, error) {
 	count := 0
 	for {
@@ -145,8 +147,7 @@ func GetKey(client *client.DataStorageClientImpl, uuid string, keyType api.KeyTy
 	}
 
 	if !hasData {
-		err = errors.New("No data")
-		return nil, errors.WrapUserFormat(err, "Could not get key %s", uuid+"/"+api.KeyType.String(keyType))
+		return nil, errors.WrapUserFormat(ErrNoData, "Could not get key %s", uuid+"/"+api.KeyType.String(keyType))
 	}
 
 	return key, nil