Fixed #68 -- NPE throws in pride do
Code cleanup
Better error reporting on module inclusion/exclusion