Added a handler of error in Media
Merge remote-tracking branch 'origin/master'