Ticket 47620 - Fix logically dead code.
    
    Coverity issues:  12419 & 12420
    
    https://fedorahosted.org/389/ticket/47620
    
    Reviewed by: rmeggins(Thanks!)
    (cherry picked from commit 080cb44f5eaa794375a8e69b6e1ac09fcae9a961)
    (cherry picked from commit c094a9f1a758dabd1164bf979a4ac22bb3720d63)