Catch both TypeError, NotImplementedError in check_noninteracting_energy_components
@@ -883,7 +883,7 @@ def check_noninteracting_energy_components(reference_system, alchemical_system,
parameters = reference_force.getParticleParameters(particle_index)
try: # GBSAOBCForce
force.addParticle(*parameters)
- except TypeError: # CustomGBForce
+ except (TypeError, NotImplementedError): # CustomGBForce
force.addParticle(parameters)
system.addForce(force)
