Some hopeful exception fixes