DatabaseHelper fix
Added some assertions