Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

diff --cc lib/router.php
index 85425bed2964854d1371a05b369ffe6be29aa058,9d0d3a3f0613382fb401fd47922b5ebae107098e..e842604e9a35d11abd55ba1194eaec80b56534f0
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -347,10 -358,19 +360,19 @@@ class Route
  
      function map($path)
      {
-         return $this->m->match($path);
+         try {
+             $match = $this->m->match($path);
+         } catch (Net_URL_Mapper_InvalidException $e) {
+             common_log(LOG_ERR, "Problem getting route for $path - " .
+                 $e->getMessage());
+             $cac = new ClientErrorAction("Page not found.", 404);
+             $cac->showPage();
+         }
+ 
+         return $match;
      }
  
 -    function build($action, $args=null, $fragment=null)
 +    function build($action, $args=null, $params=null, $fragment=null)
      {
          $action_arg = array('action' => $action);