FIXED error handling order
Merge pull request #21 from SoSocio/Beta

FIXED error handling order