Add to whitelist two errors that slipped through

Change-Id: I0347074735359d33f294d1ededc45149a29157ec
Merge "Add to whitelist two errors that slipped through"