Some bandage to avoid fatal errors in non-TUX

Bug: 44137
Change-Id: If4f11abcf4c571b43be901b801321e7a032a4b63
Merge "Some bandage to avoid fatal errors in non-TUX"