XD-813 More error handling on hsqldb shutdown