Fix an issue causing error when trying to broadcast non-saved file
Fix an issue causing error by updating file after broadcast stopped
Merge branch 'develop'