Fixed missing check for existance on models