Add more failure conditions, via intercepts