better error reporting
better container missing case handling