diff --git a/code/DocumentationService.php b/code/DocumentationService.php
index 737f54f..d612b73 100644
--- a/code/DocumentationService.php
+++ b/code/DocumentationService.php
@@ -552,6 +552,8 @@ class DocumentationService {
 
 		$folder = Controller::join_links($base, $relative);
 		
+		if(!is_dir($folder)) return false;
+			
 		$handle = opendir($folder);
 
 		if($handle) {
diff --git a/code/DocumentationViewer.php b/code/DocumentationViewer.php
index 1b089d1..3c9d5e1 100755
--- a/code/DocumentationViewer.php
+++ b/code/DocumentationViewer.php
@@ -492,11 +492,13 @@ class DocumentationViewer extends Controller {
 			return DBField::create("HTMLText", $html);
 		}
 		else {
-			// if no page found then we may want to get the listing of
-			// the folder
-			if($url = $this->Remaining) {
-				$pages = DocumentationService::get_pages_from_folder($this->getModule(), implode('/', $url), false);
-
+			// If no page found then we may want to get the listing of the folder.
+			// In case no folder exists, show a "not found" page.
+			$module = $this->getModule();
+			$url = $this->Remaining;
+			if($url && $module) {
+				$pages = DocumentationService::get_pages_from_folder($module, implode('/', $url), false);
+				// If no pages are found, the 404 is handled in the same template
 				return $this->customise(array(
 					'Title' => DocumentationService::clean_page_name(array_pop($url)),
 					'Pages' => $pages
diff --git a/templates/DocFolderListing.ss b/templates/DocFolderListing.ss
index 3490cb5..b9abd97 100644
--- a/templates/DocFolderListing.ss
+++ b/templates/DocFolderListing.ss
@@ -9,5 +9,5 @@
 		</ul>
 	</div>
 <% else %>
-	<p>Nothing to see here</p>
+	<% include DocNotFound %>
 <% end_if %>
\ No newline at end of file
diff --git a/templates/Includes/DocNotFound.ss b/templates/Includes/DocNotFound.ss
new file mode 100644
index 0000000..855c6ad
--- /dev/null
+++ b/templates/Includes/DocNotFound.ss
@@ -0,0 +1,24 @@
+					<div class="warningBox" id="pageNotFoundWarning">
+						<div class="warningBoxTop">
+							<h1>We're sorry&#8230;</h1>
+							<p>The page you are looking for does not exist, or might have moved.
+							<h5>Perhaps you could&#8230;</h5>
+							<p>return to the <a href="$BaseHref">homepage</a> or try searching (see input box on the top right).</p>
+		
+							<!-- 
+								<h5>Search results for similar/related phrases</h5>
+								<ul class="resetStyle">
+									<li><a href="#">Installing</a></li>
+									<li><a href="#">Upgrading</a></li>
+									<li><a href="#">Server-requirements</a></li>
+									<li><a href="#">Suggested-web-hosts</a></li>
+								</ul> 
+							-->
+							</div>
+							<!-- <div class="warningBoxBottom">
+								<ul>
+									<li><a href="#">Report a missing link</a></li>
+									<li><a href="#">Report a bug or a concren</a></li>
+								</ul>
+						</div> -->
+					</div>
\ No newline at end of file
diff --git a/templates/Includes/DocTableOfContents.ss b/templates/Includes/DocTableOfContents.ss
index 9e90d8a..f6d7643 100644
--- a/templates/Includes/DocTableOfContents.ss
+++ b/templates/Includes/DocTableOfContents.ss
@@ -1 +1,3 @@
-<div id="table-of-contents" class="sidebar-box"></div>
\ No newline at end of file
+<% if Content %>
+	<div id="table-of-contents" class="sidebar-box"></div>
+<% end_if %>
\ No newline at end of file
diff --git a/templates/Layout/DocumentationViewer.ss b/templates/Layout/DocumentationViewer.ss
index 20da7f0..e494842 100644
--- a/templates/Layout/DocumentationViewer.ss
+++ b/templates/Layout/DocumentationViewer.ss
@@ -3,12 +3,14 @@
 		<% if Content %>
 			$Content
 		<% else %>
-			<p>Woops page not found</p>
+			<% include DocNotFound %>
 		<% end_if %>
 	</div>
 
+	<% if Content %>
 	<div id="right-column">
 		<% include DocTableOfContents %>
 		<% include DocInThisModule %>
 	</div>
+	<% end_if %>
 </div>
\ No newline at end of file