Added more entrances to prevent exception thrown