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

#3102