* commit '1323ab83e4be088fd66ad73ea9da617e46382987': Fix 3379239: Catch exceptions from workaround for OOM.