[SPARK-1860] Using more string interpolation. Better error logging.