I resolved this issue by going directly into the 8915E-T Wks (worksheet) and deleting NA from line A (FEMA disaster number), this flowed into and removed from form 8915F-T and federal return was accepted. Repeated for 8915E-S.
