(Bug 38135) Workaround a Fatal error

Change-Id: I882cd56a63ff4709a6db6e11b995c41aa14a393a