Close #136 - Catch Null Media Values