v0.0.4: Address code review feedback - improve robustness and error handling

Co-authored-by: splitice <468579+splitice@users.noreply.github.com>