Prevent exception
Version 3.2.1
Merge branch 'fix_null_pointer_on_marshal_episode' into deluxe