Add logs and repair NPE.
Refactoring log messages.
Safe thread if catch exception.
Merged 'develop'.
Finish recovery