Fix for GSOD when adding an organization to an order with modify order

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

Fix for GSOD when adding an organization to an order with modify order