From 123dc1dcfb38d6194880e8ea58bc34c42a8ff555 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Fri, 8 Jul 2022 17:38:22 +0300
Subject: [PATCH] Improve query error handling

---
 apiserver/database/errors.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apiserver/database/errors.py b/apiserver/database/errors.py
index 9a0f0e9..daa96de 100644
--- a/apiserver/database/errors.py
+++ b/apiserver/database/errors.py
@@ -166,7 +166,10 @@ class MongoEngineErrorsHandler(object):
     @classmethod
     @throws_default_error(errors.server_error.InternalError)
     def invalid_query_error(cls, e, message, **_):
-        pass
+        if e.args:
+            inner = e.args[0]
+            if isinstance(inner, LookUpError):
+                cls.lookup_error(inner, message)
 
 
 @contextmanager