Adding error dialog, fixing up sample container app to be more like a sample.