Summer Nightmare: Not a big bug fix for errors.

Not a big bug fix for errors.