Added try/catch to window reloads
Merge branch 'ben'