Merge "Adding NPE check when the system has no tasks." into mnc-dev