Improved error checking in ForceField