Improved handling of out-of-domain errors. Improved analysis of theta