Improve detection of failures, part of MKWS-282