better error handling
[mmh] / DATE
1 2015-11-02