Added deleted interface method
Added NoneType check