Merge "Fix a NullPointerException on getting no data from"