Fix reading way past array length

Didn't realize that the array sizes itself early on to be large.  Just In
case I added a null check as well.
Re-add things removed