Merge "master: missing input shouldn't fail process"