Merge "Don't Use NPE for Flow Control in getCellLocation"