Bug Fix: Correct code block in wrong branch of if/else & wrong fixed string

Signed-off-by: Stephen Lyons <slysven@virginmedia.com>