Only set electron valency if the pi bond count and formal neighbour c…

…ount are set.
cdk · Nov 28, 2015 · 565530e · 565530e
1 parent 195631e
commit 565530e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/base/core/src/main/java/org/openscience/cdk/config/ImmutableAtomType.java b/base/core/src/main/java/org/openscience/cdk/config/ImmutableAtomType.java
@@ -75,7 +75,12 @@ final class ImmutableAtomType implements IAtomType {
         if (type.getValency() != null) {
             this.electronValency = type.getValency();
         } else {
-            this.electronValency = type.getProperty(CDKConstants.PI_BOND_COUNT, Integer.class) + type.getFormalNeighbourCount();
+            Integer piBondCount = type.getProperty(CDKConstants.PI_BOND_COUNT, Integer.class);
+            if (piBondCount != null && formalNeighbourCount != null) {
+                this.electronValency = piBondCount + formalNeighbourCount;
+            } else {
+                this.electronValency = null;
+            }
         }
     }