Removed an unnecessary error check.
Removed an unnecessary nil assignment