--- a/web/src/luan/modules/web/Server.luan	Sat Apr 18 19:57:42 2015 -0600
+++ b/web/src/luan/modules/web/Server.luan	Sun Apr 19 07:27:23 2015 -0600
@@ -16,6 +16,8 @@
 local HandlerWrapper = require "java:org.eclipse.jetty.server.handler.HandlerWrapper"
 local SessionHandler = require "java:org.eclipse.jetty.server.session.SessionHandler"
 local AuthenticationHandler = require "java:luan.modules.web.AuthenticationHandler"
+local LuanHandler = require "java:luan.modules.web.LuanHandler"
+local NotFound = require "java:luan.modules.web.NotFound"
 
 
 port = 8080
@@ -27,7 +29,7 @@
 
 authentication_handler = AuthenticationHandler.new("/private/")
 
-luan_handler = Http.new_luan_handler()
+luan_handler = LuanHandler.new()
 
 resource_handler = ResourceHandler.new()
 resource_handler.setDirectoriesListed(true)
@@ -81,6 +83,7 @@
 	resource_handler.setResourceBase(Io.Uri(base).to_string())
 	resource_handler.setWelcomeFiles {welcome_file}
 	luan_handler.setWelcomeFile(welcome_file)
+	handlers.addHandler(NotFound.new())
 	server = Server.new(port)
 	server.setHandler(hc)
 	Package.load("site:/init")