GSOD when trying to set configuration properties.  Cleaned up code

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