Fix #1059
Avoid an exception when the cp has changed & the Java model is obsolete
Fix #460
Name change