cleaned up DatabaseException handling