diff --git a/lib/generate/posts.ts b/lib/generate/posts.ts
index 15ab29e..e5c7640 100644
--- a/lib/generate/posts.ts
+++ b/lib/generate/posts.ts
@@ -37,7 +37,9 @@ async function generatePostFromFile(postPath: string, additionalMetadata: object
 
 	if (!(<PostMetadata>page.metadata).excerpt) {
 		const parts = page.text.split("<!-- excerpt-end -->");
-		(<PostMetadata>page.metadata).excerpt = parts[0];
+		if (parts.length > 1) {
+			(<PostMetadata>page.metadata).excerpt = parts[0];
+		}
 	}
 
 	return page;
diff --git a/site/includes/article-listing.html.ejs b/site/includes/article-listing.html.ejs
index 49bfebf..6e321ae 100644
--- a/site/includes/article-listing.html.ejs
+++ b/site/includes/article-listing.html.ejs
@@ -10,9 +10,11 @@
     </h2>
     <%- include("article-meta.html.ejs", { metadata: post.metadata }) %>
     <div class="article-content" itemprop="description">
-        <%- post.metadata.excerpt %>
+        <%- post.metadata.excerpt || post.text %>
     </div>
-    <p class="read-more-link">
-        <a href="<%= post.metadata.permalink%>">Read more...</a>
-    </p>
+	<% if (post.metadata.excerpt) { %>
+		<p class="read-more-link">
+			<a href="<%= post.metadata.permalink%>">Read more...</a>
+		</p>
+	<% } %>
 </article>