Fixed Indentation and re-commented the exception stuff