diff --git a/kiss/src/kiss/Helpers.hx b/kiss/src/kiss/Helpers.hx
index f8ca5d4d..003b03c5 100644
--- a/kiss/src/kiss/Helpers.hx
+++ b/kiss/src/kiss/Helpers.hx
@@ -61,7 +61,7 @@ class Helpers {
         };
     }
 
-    public static function parseComplexType(path:String, ?from:ReaderExp):ComplexType {
+    public static function parseComplexType(path:String, ?from:ReaderExp, mustResolve=false):ComplexType {
         // Trick Haxe into parsing it for us:
         var typeCheckStr = 'var thing:$path;';
         var errorMessage = 'Haxe could not parse a complex type from `$path` in `${typeCheckStr}`';
@@ -75,7 +75,7 @@ class Helpers {
         }
         try {
             var typeCheckExpr = Context.parse(typeCheckStr, Context.currentPos());
-            return switch (typeCheckExpr.expr) {
+            var t = switch (typeCheckExpr.expr) {
                 case EVars([{
                     type: complexType
                 }]):
@@ -84,6 +84,16 @@ class Helpers {
                     throwError();
                     return null;
             };
+            if (mustResolve) {
+                try {
+                    var pos = if (from != null) from.macroPos() else Context.currentPos();
+                    Context.resolveType(t, pos);
+                } catch (e:Dynamic) {
+                    errorMessage = 'Type not found: $path';
+                    throwError(); 
+                }
+            }
+            return t;
         } catch (err) {
             throwError();
             return null;
diff --git a/kiss/src/kiss/SpecialForms.hx b/kiss/src/kiss/SpecialForms.hx
index cf8138af..0bf1b074 100644
--- a/kiss/src/kiss/SpecialForms.hx
+++ b/kiss/src/kiss/SpecialForms.hx
@@ -429,17 +429,17 @@ class SpecialForms {
             if (args.length == 3) {
                 pkg = switch (args.shift().def) {
                     case Symbol(pkg): pkg;
-                    default: throw KissError.fromExp(args[0], '$whichArg argument to (the... ) should be a valid haxe package');
+                    default: throw KissError.fromExp(wholeExp, '$whichArg argument to (the... ) should be a valid haxe package');
                 };
                 whichArg = "second";
             }
             var type = switch (args[0].def) {
                 case Symbol(type): type;
-                default: throw KissError.fromExp(args[0], '$whichArg argument to (the... ) should be a valid type');
+                default: throw KissError.fromExp(wholeExp, '$whichArg argument to (the... ) should be a valid type');
             };
             if (pkg.length > 0)
                 type = pkg + "." + type;
-            ECheckType(k.convert(args[1]), Helpers.parseComplexType(type, args[0])).withMacroPosOf(wholeExp);
+            ECheckType(k.convert(args[1]), Helpers.parseComplexType(type, wholeExp, true)).withMacroPosOf(wholeExp);
         };
 
         k.doc("try", 1, null, "(try <thing> <catches...>)");
@@ -458,7 +458,7 @@ class SpecialForms {
                                             def: Symbol(name) | TypedExp(_, {pos: _, def: Symbol(name)})
                                         }
                                     ]): name;
-                                    default: throw KissError.fromExp(catchArgs[0], 'first argument to (catch... ) should be a one-element argument list');
+                                    default: throw KissError.fromExp(catchKissExp, 'first argument to (catch... ) should be a one-element argument list');
                                 },
                                 type: switch (catchArgs[0].def) {
                                     case ListExp([{pos: _, def: TypedExp(type, _)}]):
@@ -522,9 +522,9 @@ class SpecialForms {
             if (args.length > 1) {
                 switch (args[1].def) {
                     case Symbol(typePath):
-                        t = Helpers.parseComplexType(typePath, args[1]);
+                        t = Helpers.parseComplexType(typePath, wholeExp, true);
                     default:
-                        throw KissError.fromExp(args[1], 'second argument to cast should be a type path symbol');
+                        throw KissError.fromExp(wholeExp, 'second argument to cast should be a type path symbol');
                 }
             }
             ECast(e, t).withMacroPosOf(wholeExp);