Exception namespace issue fix