Disable heuristic type adder. Remove RuntimeException and replace with AnnotationException.