fix bug(s). do not check null vars when you really want to check something totally diff...