Fixes exception handling for out-of-bounds, prevents 'backwash' problem