Potential crash

I fixed a potential crash point. see commit message