Fix monitor to catch failures