Don't unwrap when we can't create a dataset (#992)

Don't unwrap when we can't create a dataset (#992) #2581