Fix another off by one and catch rare exception