Fix building with -Og
    
    When building using -Og, gcc sees that some variables can be used
    uninitialized  It can be debatable whether it is possible with our
    codeflow, but functions should be self-contained and initializations are
    always good.  The return instead of goto is due to actualType being used
    in the cleanup.
    
    Signed-off-by: Martin Kletzander <mkletzan@redhat.com>