JAL-2077 less drastic exit on close