Fix some exceptions on unsubscribe