Fix possible NPE
Merge branch 'itsisu-dev' into selectmedia