0033515: NPE in AdvancedQueryBuilder with joinAssociatedEntities if entity has computed columns

diff --git a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2010-2015 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -452,7 +452,7 @@
 
   /**
    * Compute the property from the field, assuming that the field is defined on the basis of entity.
-   *
+   * 
    * @return The property associated to this field, <code>null</code> if the field is not associated
    *         to any property or column
    */
@@ -517,6 +517,9 @@
    *         false if all of them are mandatory
    */
   public static boolean hasNullableIdentifierProperties(Entity entity) {
+    if (entity == null) {
+      return true;
+    }
     List<Property> identifierProperties = entity.getIdentifierProperties();
     for (Property property : identifierProperties) {
       if (!property.isMandatory()) {