Merge "Stop throwing exceptions in TouchExplorer"