Removing error checking; fixing immediate issue