Revert "Revert "Revert "be more robust with handling unknown sensors"""

This reverts commit 3c9c0918635143f373817fff1ce5131b995282cf.