Fixed bug in error msg. Added location_id to PO