diff --git a/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php b/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php
index 6027b68c0738eccf91fdc42e8a379f7d51c4cd17..c63a726d8e8449e3ebe709aac5828803a12961de 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/OrderGet.php
@@ -114,7 +114,7 @@ class OrderGet
                         $order->getEntityId(),
                         $orderItem->getItemId()
                     );
-                } catch (Exception $e) {
+                } catch (NoSuchEntityException $e) {
                     continue;
                 }