Replace panics with results & better option types

Replace panics with results & better option types #820