mod to catch null also