Changed maps for some exception checks etc