Possible nullpointer fix and added remote boolean for containers.