Added Some Error Checking to Containers