Fixes issue 2474

Change-Id: I2504c1076c8759d8e5d609c1e1c428e833cfcccb
Reviewed-on: http://gerrit.dmdirc.com/599
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

fixes issue 643

Change-Id: Iab135842fcb13d98bf9bb9f58589f9b30feb33a6
Reviewed-on: http://gerrit.dmdirc.com/595
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>