Fixed method calling into null instance