Missed a few bad conditions.

I must remember to use my eyes and not just Travis.