diff --git a/android/source/src/java/org/libreoffice/LOKitThread.java b/android/source/src/java/org/libreoffice/LOKitThread.java
index b4aee40c1cd3..c29f98461fb9 100644
--- a/android/source/src/java/org/libreoffice/LOKitThread.java
+++ b/android/source/src/java/org/libreoffice/LOKitThread.java
@@ -204,8 +204,9 @@ class LOKitThread extends Thread {
     /**
      * Handle load document event.
      * @param filePath - filePath to where the document is located
+     * @return Whether the document has been loaded successfully.
      */
-    private void loadDocument(String filePath) {
+    private boolean loadDocument(String filePath) {
         mLayerClient = mContext.getLayerClient();
 
         mInvalidationHandler = new InvalidationHandler(mContext);
@@ -216,8 +217,10 @@ class LOKitThread extends Thread {
             updateZoomConstraints();
             refresh(true);
             LOKitShell.hideProgressSpinner(mContext);
+            return true;
         } else {
             closeDocument();
+            return false;
         }
     }
 
@@ -227,20 +230,9 @@ class LOKitThread extends Thread {
      * @param fileType - fileType what type of new document is to be loaded
      */
     private void loadNewDocument(String filePath, String fileType) {
-        mLayerClient = mContext.getLayerClient();
-
-        mInvalidationHandler = new InvalidationHandler(mContext);
-        mTileProvider = TileProviderFactory.create(mContext, mInvalidationHandler, fileType);
-
-        if (mTileProvider.isReady()) {
-            LOKitShell.showProgressSpinner(mContext);
-            updateZoomConstraints();
-            refresh(true);
-            LOKitShell.hideProgressSpinner(mContext);
-
+        boolean ok = loadDocument(fileType);
+        if (ok) {
             mTileProvider.saveDocumentAs(filePath, true);
-        } else {
-            closeDocument();
         }
     }