Had segment fault, don't know where, so I added some bounds checks

Had segment fault, don't know where, so I added some bounds checks #75