Bug fix GSOD when viewing RetroCI sample

https://www.pivotaltracker.com/story/show/60978662
Merge pull request #52 from pfschwartz/develop

Bug fix GSOD when viewing RetroCI sample