More robust error handling when container missing