Harden free energy calculation for unsampled states.

Should address #124