BUGIFX: wrong order in if-statement led to checking an (in some cases) uninitialized...