Fix everything.

Without expected exceptions! =D