Change -a to -s
Replace explicit exit() with a PO exception
Remove redundant includes