Fix #24 - check for a value explicitly and then also call .toString() on it