Replace TODO with exception