JBIDE-18412 - further fallback and exception handling