Fixed 2 small bugs: concatenating and comparing with None