fixes for errors on workorders SENTRY EVENT: 1397