Random occurring error - checking in for discussion.

Was causing random errors during test runs.