Null check here.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Don't trim twice.
Signed-off-by: Chris Sanders <zidane@outlook.com>