Almost certainly causes problems if the exception ever occurs (should this go in 4.0.4?)