Added error checking in matcher to ensure that descriptors actually contain something
Commit before merge with master