Small patch for null inputs