Fix except and add skip empty lines check