fix: replace panics with results & better option types (#437)

fix: replace panics with results & better option types (#437) #827