Prevent segfaults when a simulation blows up
Merge pull request #170 from peastman/master

Prevent segfaults when a simulation blows up