Add error handling when executing checks