[TYPE] Fix bug with self type checking
[TYPE] Correct unexpected throw on class type