Kill old code. More exception handling.