diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
index ccdb5534c0e2..9473dd9b4ba8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
@@ -662,6 +662,13 @@ public void handleAutoSavePostIfNotDraftResult(@NonNull AutoSavePostIfNotDraftRe
     public void onPostUploaded(OnPostUploaded event) {
         // check if the event is related to the PostModel that is being uploaded by PostUploadHandler
         if (!isPostUploading(event.post)) {
+            AppLog.w(T.POSTS, "PostUploadHandler > onPostUploaded: ignoring event for post "
+                              + (event.post != null ? event.post.getId() : "null")
+                              + " because it is not the currently uploading post"
+                              + " (current=" + (sCurrentUploadingPost != null
+                              ? sCurrentUploadingPost.getId() : "null") + ")"
+                              + (event.isError() ? " error: " + event.error.type
+                              + " " + event.error.message : ""));
             return;
         }
         SiteModel site = mSiteStore.getSiteByLocalId(event.post.getLocalSiteId());
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java
index 01acbd97fc0c..83cd6f7b29a8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java
@@ -459,6 +459,8 @@ public static void publishPost(Activity activity, final PostModel post, SiteMode
             if (onPublishingCallback != null) {
                 onPublishingCallback.onPublishing(isFirstTimePublish);
             }
+        } else {
+            ToastUtils.showToast(activity, R.string.no_network_message, ToastUtils.Duration.SHORT);
         }
         PostUtils.trackSavePostAnalytics(post, site);
     }