Remove old unneeded error checking
Merge pull request #177 from timschofield/develop

Remove old unneeded error checking