More checks and exceptions