Add checks for generic types and discard any unexpected types (#430)

Add checks for generic types and discard any unexpected types (#430) #2104