Merge pull request #111 from maksimov/develop

Temporary fix for OOM errors occuring in DescribeImages. Fix for NPE in ...