Change bool to throw - Clean old catch (...)