[REQS-249] Out of bound exception

@stuartw This needs a bit more thought than what I did. If you have some already, feel free to share!