Handle null ini files
Stop silly doubling behaviour (hibernate workaround)