Some timeout and checks hopefully fix intermittent failure when slotting.
Merge pull request #1330 from Kenneth-T-Moore/herb_mm

Some timeout and checks hopefully fix intermittent failure when slotting...