Fix an issue where message variations in versions of javac cause failures