Attempt to get more stuff working.

Exceptions, exceptions, exceptions.