Crash itself in case of a DB error
Dropped unnecessary code