Add 404 handler. Remove last message usage. Syntax cleanup.