@bcwaldon checking error and panic here might help to catch future bugs.