Added checks in __autoload - important for debugging this version currently.

Looks like we have a problem with the inclusion of some files here and
there...