More protection, all cases checked now

Well... Hopefully at least most of the more common ones.