Error checking was too stringent - broke some functions