#65: Fix Movie error handling