Some very small changes, like ensuring that all catch blocks do
something