Fix crash on Roam exit Fix #155