Apply live hack from Wikimedia code base -- more verbose reporting and protection...