diff --git a/dali/ft/daftformat.cpp b/dali/ft/daftformat.cpp
index a20c8700338..5fff5a03460 100644
--- a/dali/ft/daftformat.cpp
+++ b/dali/ft/daftformat.cpp
@@ -373,8 +373,9 @@ CriticalSection CInputBasePartitioner::openfilecachesect;
 CInputBasePartitioner::~CInputBasePartitioner()
 {
     inStream.clear();
-    if (openfilecache) {
-        CriticalBlock block(openfilecachesect);
+    CriticalBlock block(openfilecachesect);
+    if (openfilecache)
+    {
         if (openfilecache->Release())
             openfilecache = NULL;
     }
@@ -1704,8 +1705,9 @@ CJsonInputPartitioner::~CJsonInputPartitioner()
 {
     json.clear();
     inStream.clear();
-    if (openfilecache) {
-        CriticalBlock block(openfilecachesect);
+    CriticalBlock block(openfilecachesect);
+    if (openfilecache)
+    {
         if (openfilecache->Release())
             openfilecache = NULL;
     }