Merge "Add to whitelist two errors that slipped through"