AWE
ADD: Added class scanner exception handling