Fixes issue 4152 Fixes issue 4002 Change-Id: I664124ecb0994a808e2de359a38507c3b5f16452 Reviewed-on: http://gerrit.dmdirc.com/1250 Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com> Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>