Handle MOSH_KEY deletion & errors better