extra null check for old startup handler. (#70)