Fixes issue 3166, fixes issue 3167 Change-Id: I9612d9244c137d2fcd13fff96beda189a51ed9d8 Reviewed-on: http://gerrit.dmdirc.com/95 Reviewed-by: Shane Mc Cormack <shane@dmdirc.com> Tested-by: Chris Smith <chris@dmdirc.com>