Fixed problem with catch blocks caused by previous commit.