error handling of container
Merge branch 'stupid-banana' into development
Merge branch 'development'