diff --git a/src/device/services/device.service.ts b/src/device/services/device.service.ts
index 9b78de5..59cee2f 100644
--- a/src/device/services/device.service.ts
+++ b/src/device/services/device.service.ts
@@ -582,6 +582,9 @@ export class DeviceService {
 
       return { successResults, failedResults };
     } catch (error) {
+      if (error instanceof HttpException) {
+        throw error;
+      }
       throw new HttpException(
         error.message || 'Device Not Found',
         error.status || HttpStatus.NOT_FOUND,
@@ -1116,6 +1119,9 @@ export class DeviceService {
         });
       }
     } catch (error) {
+      if (error instanceof HttpException) {
+        throw error;
+      }
       throw new HttpException(
         error.message || 'Internal server error',
         HttpStatus.INTERNAL_SERVER_ERROR,