More null checks
Actually delete on error
Merge branch 'master' of github.com:profplump/UberZach-Video