src/Pure/General/sql.scala

     def timing(c1: Column, c2: Column, c3: Column): Timing =
       Timing(Time.ms(long(c1)), Time.ms(long(c2)), Time.ms(long(c3)))
 
     def get[A](column: Column, f: Column => A): Option[A] = {
       val x = f(column)
-      if (rep.wasNull) None else Some(x)
+      if (rep.wasNull || x == null) None else Some(x)
     }
     def get_bool(column: Column): Option[Boolean] = get(column, bool)
     def get_int(column: Column): Option[Int] = get(column, int)
     def get_long(column: Column): Option[Long] = get(column, long)
     def get_double(column: Column): Option[Double] = get(column, double)

     def update_date(stmt: SQL.Statement, i: Int, date: Date): Unit =
       if (date == null) stmt.string(i) = (null: String)
       else stmt.string(i) = date_format(date)
 
     def date(res: SQL.Result, column: SQL.Column): Date =
-      date_format.parse(res.string(column))
+      proper_string(res.string(column)) match {
+        case None => null
+        case Some(s) => date_format.parse(s)
+      }
 
     def insert_permissive(table: SQL.Table, sql: SQL.Source = ""): SQL.Source =
       table.insert_cmd(cmd = "INSERT OR IGNORE", sql = sql)
   }
 }