Bug fix -- GSOD when navigation to modify sample page

https://www.pivotaltracker.com/story/show/57264368