Fixed some dead error checking.
Flow cleanup.
No logic changes.
Merge pull request #26 from JeremyAgost/service-error-flow

Fixed some dead error checking.