Fix try/catch block
Structure fixes
Merge branch 'master' of https://github.com/korotovsky/yii-elasticsearch