Merge "Fixing the errors on OOM"