Merge "Removed checks for null that introduced bug." into studio-1.4-dev