knock out the todo's
swap null returns for new Error()