Add checks for generic types and discard any unexpected types

Add checks for generic types and discard any unexpected types #2101