Add option to not raise if output is none, resolves #538

Add option to not raise if output is none, resolves #538 #377