fix for null id.
fix for null id.
oops