Better error reporting; Sig.default; refactor