diff --git a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-rest/src/main/java/org/activiti/cloud/services/query/rest/CommonExceptionHandlerQuery.java b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-rest/src/main/java/org/activiti/cloud/services/query/rest/CommonExceptionHandlerQuery.java
index 96525846e1..833137cd0f 100644
--- a/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-rest/src/main/java/org/activiti/cloud/services/query/rest/CommonExceptionHandlerQuery.java
+++ b/activiti-cloud-query-service/activiti-cloud-services-query/activiti-cloud-services-query-rest/src/main/java/org/activiti/cloud/services/query/rest/CommonExceptionHandlerQuery.java
@@ -59,17 +59,12 @@ public EntityModel<ActivitiErrorMessage> handleAppException(
 
     @ExceptionHandler({ ConversionFailedException.class })
     @ResponseStatus(HttpStatus.BAD_REQUEST)
-    public EntityModel<ActivitiErrorMessage> handleAppException(
-        ConversionFailedException ex,
-        HttpServletResponse response
-    ) {
+    public ActivitiErrorMessage handleAppException(ConversionFailedException ex, HttpServletResponse response) {
         LOGGER.error(ex.getMessage(), ex);
         response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-        return EntityModel.of(
-            new ActivitiErrorMessageImpl(
-                HttpStatus.BAD_REQUEST.value(),
-                ErrorAttributesMessageSanitizer.ERROR_NOT_DISCLOSED_MESSAGE
-            )
+        return new ActivitiErrorMessageImpl(
+            HttpStatus.BAD_REQUEST.value(),
+            ErrorAttributesMessageSanitizer.ERROR_NOT_DISCLOSED_MESSAGE
         );
     }
 
diff --git a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessInstancesEntityIT.java b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessInstancesEntityIT.java
index 00973f176e..89a2565b8c 100644
--- a/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessInstancesEntityIT.java
+++ b/activiti-cloud-query-service/activiti-cloud-starter-query/src/test/java/org/activiti/cloud/starter/tests/QueryProcessInstancesEntityIT.java
@@ -70,6 +70,7 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.info.BuildProperties;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
@@ -83,6 +84,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.transaction.annotation.Transactional;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -133,6 +135,9 @@ public class QueryProcessInstancesEntityIT {
     @Autowired
     private VariableRepository variableRepository;
 
+    @MockitoBean
+    private BuildProperties buildProperties;
+
     private EventsAggregator eventsAggregator;
 
     private ProcessInstanceEventContainedBuilder processInstanceBuilder;