In general I think we should add exceptions now and fix later.