Merge pull request #1 from core9/develop

extra error handling needs cleaning