Improved the handling of issues with geometry optimization data.

12 jobs for overview-small-fixes in 27 minutes and 3 seconds (queued for 2 seconds)