Correct issues with Exception handling
Correct reference to XoopsModuleAdmin
Resolving conflicts
Merge pull request #128 from geekwright/master

Includes conflict resolved PR 127 and other fixes