Merge "Fix NULL deref on exec-in with insufficient arguments"