This should fix toString NPEs