clearer code for breaking on exception, added +1 in presentation