better catching of generic errors, thanks Gleb!