@@ -286,7 +286,13 @@ prepare_apply fn imps =
286286 when i (movelast n)
287287 mkClaims sc' is (n : claims)
288288 mkClaims t [] claims = return (reverse claims)
289− mkClaims _ _ _ = fail $ "Wrong number of arguments for " ++ show fn
289+ mkClaims _ _ _
290+ | Var n <- fn
291+ = do ctxt <- get_context
292+ case lookupTy Nothing n ctxt of
293+ [] -> lift $ tfail $ NoSuchVariable n
294+ _ -> fail $ "Too many arguments for " ++ show fn
295+ | otherwise = fail $ "Too many arguments for " ++ show fn
290296
291297 doClaim ((i, _), n, t) = do claim n t
292298 when i (movelast n)