Fixed null check of fileQuery storage item