Catch a possible crash and update comments