-Better logging messages
-Added switch to accommodate different handler-case behaviors