#79 and BroadleafCommerce/DemoSitePrivate#36  - fixes 500 error