From 7f691dada2463d2e2df039db6905ea9501aabd53 Mon Sep 17 00:00:00 2001
From: Nathaniel Bauernfeind <natebauernfeind@deephaven.io>
Date: Wed, 27 Oct 2021 10:07:35 -0600
Subject: [PATCH] bug fix

---
 .../main/java/io/deephaven/db/tables/lang/DBLanguageParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DB/src/main/java/io/deephaven/db/tables/lang/DBLanguageParser.java b/DB/src/main/java/io/deephaven/db/tables/lang/DBLanguageParser.java
index dccc4c34967..4292cd7a873 100644
--- a/DB/src/main/java/io/deephaven/db/tables/lang/DBLanguageParser.java
+++ b/DB/src/main/java/io/deephaven/db/tables/lang/DBLanguageParser.java
@@ -1178,7 +1178,7 @@ else if (fromBoxedType) {
         if (toPrimitive && !ret.equals(boolean.class) && !ret.equals(exprType)) {
             // Casting to a primitive, except booleans and the identity conversion
             printer.append(ret.getSimpleName());
-            if (isAssignableFrom(PyObject.class, exprType)) {
+            if (exprType != NULL_CLASS && isAssignableFrom(PyObject.class, exprType)) {
                 printer.append("PyCast((PyObject)");
             } else {
                 printer.append("Cast(");