No test, but I think this will fix #762.
Merge pull request #763 from afred/episode-nil-762

No test, but I think this will fix #762.