Make debug code throw less exceptions and be more readable, less levels of indent