Fix error messaging for video content
Merge branch 'hotfix/0.2.1'
Merge tag '0.2.1' into develop

0.2.1