HHH-9136 - DatabaseMetadata: NPE hides exception in finally block
- Protection against NPE in finally block
- Little formatting fixes