shrayolacrayon Merge pull request #28 from ready4god2513/err-check …