A little bit of cleanup. Catches a few errors when cache data isn't present