less panic

Change-Id: I9ebe229441d027def35202a6fc8741466a50363d
Merge "less panic"