Fix missing return. Fix file handler type