fix some more crashes in mafia
Merge pull request #925 from MJB47/mafia

fix some more crashes in mafia