Feature/handle cv free entry exception

Closes #194 and closes #193