fix "nil" warnings
post srm635 easy