fix: print help if custom CLI is empty & replace unwrap where prossible

fix: print help if custom CLI is empty & replace unwrap where prossible #4019