Error checking.
Tiny cleanup