minor fixes to null return