Add further defensive coding to the perf and availability with penalty app