Add further defensive coding to perf and availability app