Hotfix to make MM more error resiliant.

Signed-off-by: mannerman <oscar@eth1.nu>