From 846c574f215a4344f43b07e9b67f05aa7210242d Mon Sep 17 00:00:00 2001
From: Stephan Wald <swald@basis.com>
Date: Mon, 30 Apr 2018 13:43:27 +0200
Subject: [PATCH] added check for null

---
 BBjGridExWidget.bbj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BBjGridExWidget.bbj b/BBjGridExWidget.bbj
index 2631f0c6..36087829 100644
--- a/BBjGridExWidget.bbj
+++ b/BBjGridExWidget.bbj
@@ -500,7 +500,7 @@ class public BBjGridExWidget extends BBjWidget
     method public void setData( ResultSet rs!)
         #RS! = rs!
 
-        if #AttributesRecord! <> NULL() AND rs!.size() >0 then
+        if #AttributesRecord! <> NULL() AND rs! <> NULL() AND rs!.size() >0 then
             rem TODO: use the new method of components as soon as implemented
             rem https://github.com/BasisHub/components/issues/87
             r1! = rs!.getItem(0)
@@ -512,7 +512,7 @@ class public BBjGridExWidget extends BBjWidget
             wend
         fi
 
-        if #ColumnDefinition! <> NULL() AND rs!.size() >0 then
+        if #ColumnDefinition! <> NULL() AND rs! <> NULL() AND rs!.size() >0 then
             r1! = rs!.getItem(0)
             ar! = #ColumnDefinition!
             it! = r1!.getFieldNames().iterator()