added some error handling
Merge branch 'master' of https://github.com/stevekane/videosite
latest changes
merge conflict resolve