Added support for empty or not found .json