moved err check
Merge pull request #213 from ethereum/develop

moved err check