b8f9ef9910
Also make getTypeVariable() nullable: when a type is not found, it's better to use error type instead of throwing an exception