* Bugfix: Prevent php error which causes a long running script