trim angle brackets, fix getScheme() check, it doesn’t return null, but an empty string
trim angle brackets, fix getScheme() check, it doesn’t return null, but an empty string

jonnybarnes/jonnybarnes.uk,jonnybarnes/jonnybarnes.uk,jonnybarnes/jonnybarnes.uk