Exceptions, checks, improved stability