1 files changed, 4 insertions, 6 deletions
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index d91c0785304c..cfdfde131120 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -809,13 +809,11 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName )
         sTemp = aName.copy ( nOldIndex, nIndex - nOldIndex );
         if ( nIndex == nOldIndex )
             break;
-        if ( pCurrent->hasByName( sTemp ) )
-        {
-            pPrevious = pCurrent;
-            pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
-        }
-        else
+        if ( !pCurrent->hasByName( sTemp ) )
             throw NoSuchElementException(THROW_WHERE );
+
+        pPrevious = pCurrent;
+        pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
         nOldIndex = nIndex+1;
     }