Timing and exception handing fixes.