Changed to PL subsystem
Added exception handler