Corrected namespace exception issues