--- a/src/elaborate.sml	Thu Jun 19 12:39:22 2008 -0400
+++ b/src/elaborate.sml	Thu Jun 19 15:15:00 2008 -0400
@@ -1097,6 +1097,7 @@
              (sgnError env (UnboundSgn (loc, x));
               (L'.SgnError, loc))
            | SOME (n, sgis) => (L'.SgnVar n, loc))
+      | L.SgnFun _ => raise Fail "Elaborate functor sig"
 
 fun sgiOfDecl (d, loc) =
     case d of
@@ -1343,6 +1344,7 @@
                          (strerror, sgnerror))
               | SOME sgn => ((L'.StrProj (str', x), loc), sgn)
         end
+      | L.StrFun _ => raise Fail "Elaborate functor"
 
 val elabFile = ListUtil.foldlMap elabDecl