GSOD when trying to set configuration properties

https://www.pivotaltracker.com/story/show/78488128
GSOD when trying to set configuration properties.  Cleaned up code

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

GSOD when trying to set configuration properities from admin screen