diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/AddColumnTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/AddColumnTask.java
index 261764cfd809e..820ea54e7c95d 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/execution/AddColumnTask.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/execution/AddColumnTask.java
@@ -89,7 +89,7 @@ public ListenableFuture<?> execute(AddColumn statement, TransactionManager trans
         try {
             type = metadata.getType(parseTypeSignature(element.getType()));
         }
-        catch (UnknownTypeException e) {
+        catch (IllegalArgumentException | UnknownTypeException e) {
             throw new SemanticException(TYPE_MISMATCH, element, "Unknown type '%s' for column '%s'", element.getType(), element.getName());
         }
         if (type.equals(UNKNOWN)) {
diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTableTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTableTask.java
index 7bf67508063f5..e3d868cb6ae8c 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTableTask.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTableTask.java
@@ -126,7 +126,7 @@ public ListenableFuture<?> internalExecute(CreateTable statement, Metadata metad
                 try {
                     type = metadata.getType(parseTypeSignature(column.getType()));
                 }
-                catch (UnknownTypeException e) {
+                catch (IllegalArgumentException | UnknownTypeException e) {
                     throw new SemanticException(TYPE_MISMATCH, element, "Unknown type '%s' for column '%s'", column.getType(), column.getName());
                 }
                 if (type.equals(UNKNOWN)) {
diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
index 002b667eb68d9..d3ca87f4ac72e 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
@@ -890,7 +890,7 @@ protected Type visitGenericLiteral(GenericLiteral node, StackableAstVisitorConte
             try {
                 type = functionAndTypeResolver.getType(parseTypeSignature(node.getType()));
             }
-            catch (UnknownTypeException e) {
+            catch (IllegalArgumentException | UnknownTypeException e) {
                 throw new SemanticException(TYPE_MISMATCH, node, "Unknown type: " + node.getType());
             }
 
@@ -913,7 +913,7 @@ protected Type visitEnumLiteral(EnumLiteral node, StackableAstVisitorContext<Con
             try {
                 type = functionAndTypeResolver.getType(parseTypeSignature(node.getType()));
             }
-            catch (UnknownTypeException e) {
+            catch (IllegalArgumentException | UnknownTypeException e) {
                 throw new SemanticException(TYPE_MISMATCH, node, "Unknown type: " + node.getType());
             }
 
diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionTreeUtils.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionTreeUtils.java
index ffe7a7a7c8d5e..7ad6060e5a90d 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionTreeUtils.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionTreeUtils.java
@@ -153,7 +153,7 @@ public static Optional<TypeWithName> tryResolveEnumLiteralType(QualifiedName qua
                 return Optional.of((TypeWithName) baseType);
             }
         }
-        catch (UnknownTypeException e) {
+        catch (IllegalArgumentException | UnknownTypeException e) {
             return Optional.empty();
         }
         return Optional.empty();