We need to confirm in what cases things fail/how media section matching is actually supposed to work. I think we may be missing out on important error handling #784
