Add new patch to stop fatal errors when entities can not be loaded.
Merge pull request #3143 from openscholar/3102-stopgap

Add new patch to stop fatal errors when entities can not be loaded.