Bug fix for GSOD when adding non conformity items

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

Bug fix for GSOD when adding non conformity items