diff --git a/CHANGELOG b/CHANGELOG
index dbc6085..f8cd988 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,9 @@ Maui 3.3.2
   - catch socket errors for MSUAcceptClient. So no errors in the log file (Author: Jonathan Barber, applied 
     by Bas van der Vlies): 
      * accept call failed, errno: 11 (Resource temporarily unavailable)
-
+  - Fixed an segv for showq -r, when user submit a job without specifying how many nodes, just a node property, eg:
+     * qsub -lnodes=infiniband -Ii (Authors: Bas van der Vlies/Dennis Stam, SURFsara)
+    
 Maui 3.3.1
   - Fixed issue where hostlist was being overwritten resulting in broken $PBS_NODEFILE. (Alexis Cousein)
   - Fixed issue where users could set system priority on their own jobs. (Bas van der Vlies)
diff --git a/src/server/UserI.c b/src/server/UserI.c
index 50e6c57..72f52b9 100644
--- a/src/server/UserI.c
+++ b/src/server/UserI.c
@@ -10139,7 +10139,7 @@ int UIQueueShowAJobs(
       J->PSUtilized,
       P->Name,
       RQ->TaskCount * RQ->DRes.Mem,
-      ((J->NodeList != NULL) && (J->NodeList[0].N->Name[0] != '\0')) ?
+      ((J->NodeList != NULL) && (J->NodeList[0].N != NULL) && (J->NodeList[0].N->Name[0] != '\0')) ?
         MNodeAdjustName(J->NodeList[0].N->Name,0) : NONE,
       J->Flags,
       J->AWallTime,