Specifying non-existant column in --columns cmd line option causes NullPointerException

If a non-existent column is present within the --columns command line option for a sqoop import, the following non-informative error (a NullPointerException) is generated:

10/11/15 14:17:30 INFO tool.CodeGenTool: Beginning code generation
10/11/15 14:17:30 INFO manager.MySQLManager: Executing SQL statement: SELECT t.* FROM `mail_trials` AS t LIMIT 1
10/11/15 14:17:30 ERROR sqoop.Sqoop: Got exception running Sqoop: java.lang.NullPointerException
java.lang.NullPointerException
at com.cloudera.sqoop.orm.ClassWriter.generateFields(ClassWriter.java:431)
at com.cloudera.sqoop.orm.ClassWriter.generateClassForColumns(ClassWriter.java:1118)
at com.cloudera.sqoop.orm.ClassWriter.generate(ClassWriter.java:990)
at com.cloudera.sqoop.tool.CodeGenTool.generateORM(CodeGenTool.java:82)
at com.cloudera.sqoop.tool.ImportTool.importTable(ImportTool.java:337)
at com.cloudera.sqoop.tool.ImportTool.run(ImportTool.java:423)
at com.cloudera.sqoop.Sqoop.run(Sqoop.java:134)
at org.apache.hadoop.util.ToolRunner.run(ToolRunner.java:65)
at org.apache.hadoop.util.ToolRunner.run(ToolRunner.java:79)
at com.cloudera.sqoop.Sqoop.runSqoop(Sqoop.java:170)
at com.cloudera.sqoop.Sqoop.runTool(Sqoop.java:196)
at com.cloudera.sqoop.Sqoop.main(Sqoop.java:205)