diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 451144556..a79faf032 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
+- Fix: check access to data in fillService facility
 - Fix: use expressionLanguage defined in group is not defined at device level (#1027)
 - Fix: ensure service of groups, device and commands is stored in mongo in lowercase (#1023)
 - Add: add getTypeSilently for device group and use in device registration to avoid false mongo alarm
diff --git a/lib/services/common/domain.js b/lib/services/common/domain.js
index 464c5b699..cf74a5163 100644
--- a/lib/services/common/domain.js
+++ b/lib/services/common/domain.js
@@ -195,11 +195,11 @@ function finishSouthboundTransaction(callback) {
  * @return {Object}             New context containing service information.
  */
 function fillService(context, data) {
-    if (data.service) {
+    if (data && data.service) {
         context.srv = data.service;
     }
 
-    if (data.subservice) {
+    if (data && data.subservice) {
         context.subsrv = data.subservice;
     }