added some error checks + added fix for update bug
Merge branch 'master' of github.com:OPENi-ict/dao
removed console.log