Making my container safer

More reading: