diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
index 403c492..81d08b2 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java
@@ -315,13 +315,15 @@
 
                 @Override
                 public void close() throws HyracksDataException {
-                    state.hybridHJ.closeBuild();
-                    if (isFailed) {
-                        state.hybridHJ.clearBuildTempFiles();
-                    } else {
-                        ctx.setStateObject(state);
-                        if (LOGGER.isTraceEnabled()) {
-                            LOGGER.trace("OptimizedHybridHashJoin closed its build phase");
+                    if (state.hybridHJ != null) {
+                        state.hybridHJ.closeBuild();
+                        if (isFailed) {
+                            state.hybridHJ.clearBuildTempFiles();
+                        } else {
+                            ctx.setStateObject(state);
+                            if (LOGGER.isTraceEnabled()) {
+                                LOGGER.trace("OptimizedHybridHashJoin closed its build phase");
+                            }
                         }
                     }
                 }