minor tidy up - don't set a variable when passing in NULL will do