Error checking
Fixing