Merge branch 'develop'
Added error messages to DBHandler
Whoops.(merge w/master):