Fix with catching DB error