404 seems to be broken again

When a nonexisting page is accessed, the page loads indefinetly. The reason for this is probably this change: !1211 (diffs) by @hansegucker but I am not sure