Merge pull request #38 from faizkhan00/731-pr

Add error handling
Prep SP25 value
Merge pull request #39 from faizkhan00/731-pr

Add rest of ECs
Add exception just in case
Merge pull request #40 from faizkhan00/731-pr

Add exception just in case
merge commit