fix further instances where we were trying to call a possible None callback function