Improved error message
Fixed error in set matching