diff --git a/app/src/main/java/com/readrops/app/activities/ItemActivity.java b/app/src/main/java/com/readrops/app/activities/ItemActivity.java
index 33b341f0..79653de1 100644
--- a/app/src/main/java/com/readrops/app/activities/ItemActivity.java
+++ b/app/src/main/java/com/readrops/app/activities/ItemActivity.java
@@ -172,7 +172,7 @@ public class ItemActivity extends AppCompatActivity {
             Utils.setDrawableColor(dateLayout.getBackground(), itemWithFeed.getColor());
         }
 
-        if (item.getAuthor() != null) {
+        if (item.getAuthor() != null && !item.getAuthor().isEmpty()) {
             author.setText(getString(R.string.by_author, item.getAuthor()));
             author.setVisibility(View.VISIBLE);
         }
diff --git a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java b/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java
index 5b810241..3258c658 100644
--- a/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java
+++ b/app/src/main/java/com/readrops/app/utils/ReadropsWebView.java
@@ -73,7 +73,12 @@ public class ReadropsWebView extends WebView {
     @Nullable
     private String getText() {
         if (itemWithFeed.getItem().getText() != null) {
-            Document document = Jsoup.parse(Parser.unescapeEntities(itemWithFeed.getItem().getText(), false), itemWithFeed.getWebsiteUrl());
+            Document document;
+
+            if (itemWithFeed.getWebsiteUrl() != null)
+                document = Jsoup.parse(Parser.unescapeEntities(itemWithFeed.getItem().getText(), false), itemWithFeed.getWebsiteUrl());
+            else
+                document = Jsoup.parse(Parser.unescapeEntities(itemWithFeed.getItem().getText(), false));
 
             formatDocument(document);