diff --git a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
index b9ce83fe..9590fba0 100644
--- a/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
+++ b/app/src/main/java/org/mian/gitnex/actions/IssueActions.java
@@ -1,5 +1,6 @@
 package org.mian.gitnex.actions;
 
+import android.app.Activity;
 import android.content.Context;
 import androidx.annotation.NonNull;
 import org.gitnex.tea4j.v2.models.Comment;
@@ -112,7 +113,10 @@ public class IssueActions {
 
 						IssueDetailActivity.singleIssueUpdate = true;
 						((IssueDetailActivity) ctx).onResume();
-						RepoDetailActivity.updateRepo = true;
+						if(((Activity) ctx).getIntent().getStringExtra("openedFromLink") == null ||
+							!((Activity) ctx).getIntent().getStringExtra("openedFromLink").equals("true")) {
+							RepoDetailActivity.updateRepo = true;
+						}
 					}
 				}
 				else if(response.code() == 401) {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
index 7cd33d7b..1282a785 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/CommitDetailFragment.java
@@ -146,8 +146,11 @@ public class CommitDetailFragment extends Fragment {
 						// we need a ClickListener here to prevent that the ItemClickListener of the diffFiles ListView handles clicks for the header
 					});
 					CommitDetailFragment.this.binding.diffFiles.addHeaderView(binding.getRoot());
-					assert response.body() != null;
 					Commit commitsModel = response.body();
+					if(commitsModel == null) {
+						onFailure(call, new Throwable());
+						return;
+					}
 					String[] commitMessageParts = commitsModel.getCommit().getMessage().split("(\r\n|\n)", 2);
 
 					if(commitMessageParts.length > 1 && !commitMessageParts[1].trim().isEmpty()) {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
index 446dae2d..ec0ea6bd 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@@ -263,13 +263,19 @@ public class RepoInfoFragment extends Fragment {
 					switch(response.code()) {
 
 						case 200:
-							try {
-								assert response.body() != null;
-								Markdown.render(ctx, response.body().string(), binding.repoFileContents, repository);
-							}
-							catch(IOException e) {
-								e.printStackTrace();
-							}
+							assert response.body() != null;
+							new Thread(() -> {
+								try {
+									Markdown.render(ctx, response.body().string(), binding.repoFileContents, repository);
+								}
+								catch(IOException e) {
+									requireActivity().runOnUiThread(() -> {
+										Toasty.error(ctx, ctx.getString(R.string.genericError));
+										binding.fileContentsFrameHeader.setVisibility(View.GONE);
+										binding.fileContentsFrame.setVisibility(View.GONE);
+									});
+								}
+							}).start();
 							break;
 
 						case 401: