Check es6 default export against null, swapped null check in processConfiguredOptions

Author: johanneslumpe

bin/convert-argv.js

@@ -94,7 +94,10 @@ module.exports = function(optimist, argv, convertOptions) {
 		configFileLoaded = true;
 	}
 
-	var isES6DefaultExportedFunc = (typeof options === "object" && typeof options["default"] === "function");
+	var isES6DefaultExportedFunc = (
+		typeof options === "object" && options !== null && typeof options["default"] === "function"
+	);
+
 	if(typeof options === "function" || isES6DefaultExportedFunc) {
 		options = isES6DefaultExportedFunc ? options.default : options;
 		options = options(argv.env, argv);
@@ -103,7 +106,7 @@ module.exports = function(optimist, argv, convertOptions) {
 	return processConfiguredOptions(options);
 
 	function processConfiguredOptions(options) {
-		if(typeof options !== "object" || options === null) {
+		if(options === null || typeof options !== "object") {
 			console.error("Config did not export an object or a function returning an object.");
 			process.exit(-1); // eslint-disable-line
 		}