CDB-2765 Store a bit more info (needed by the browser)
CDB-2765 Give meaningful feedback to the user