Fixed a couple of bugs found by Coverity

• Fix "dereference after null check" error introduced with e6f3bc22 (mr !455 (merged))
• Fix "uninitialized member" error introduced with 99edb6c4 (mr !420 (merged))