First pass
Fixes
Fixes
Merge pull request #134 from dockyard/bc-server-rendered-errors

Server Rendered Errors