Some sensor klocwork fixes.
Removed duplicate NULL checking.
Merge branch 'jason_sen_klocwork'