Fix exception with unwrapping certain messages