diff --git a/dali/base/dadfs.cpp b/dali/base/dadfs.cpp
index 43f13ac2291..51100ed8a6f 100644
--- a/dali/base/dadfs.cpp
+++ b/dali/base/dadfs.cpp
@@ -6274,10 +6274,12 @@ class CDistributedSuperFile: public CDistributedFileBase<IDistributedSuperFile>
         if (sub)
         {
             unsigned subfilen = idx;
-            ForEachItemIn(i,subfiles) {
+            ForEachItemIn(i,subfiles)
+            {
                 IDistributedFile &f=subfiles.item(i);
                 IDistributedSuperFile *super = f.querySuperFile();
-                if (super) {
+                if (super)
+                {
                     unsigned ns = super->numSubFiles(true);
                     if (ns>subfilen)
                         return super->querySubFile(subfilen,true);
@@ -6288,7 +6290,8 @@ class CDistributedSuperFile: public CDistributedFileBase<IDistributedSuperFile>
             }
             throw makeStringExceptionV(-1,"CDistributedSuperFile::querySubFile(%u) for superfile %s - subfile doesn't exist ", idx, logicalName.get());
         }
-        return subfiles.item(idx);
+        else
+            return subfiles.item(idx);
     }
 
     virtual IDistributedFile *querySubFileNamed(const char *name, bool sub) override