Hotfix-0.2.3 resolved, added error handle when database is down
Merge branch 'hotfix-0.2.3'