reorder a few things, so that logging works properly very early already
1 file changed