DbHelper will no longer crash us
Merge remote-tracking branch 'origin/master'
Added comment and a single bugfix.