Fixed some exceptions left over from last few commits.