Merge branch 'master' into DEV-569

Author: JongChern

ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java

@@ -3087,9 +3087,14 @@ public void disableAllAlgorithms(){
 	public boolean isECGAlgoEnabled(AbstractAlgorithm abstractAlgorithm){
 		SensorDetails ecgSensorDetails = getSensorDetails(Configuration.Shimmer3.SENSOR_ID.HOST_ECG);
 		SensorDetails respSensorDetails = getSensorDetails(Configuration.Shimmer3.SENSOR_ID.HOST_EXG_RESPIRATION);
-		if((ecgSensorDetails.isEnabled() || respSensorDetails.isEnabled()) && abstractAlgorithm.mAlgorithmName.contains("ECGtoHR")){
+		
+		if (ecgSensorDetails!=null && ecgSensorDetails.isEnabled() && abstractAlgorithm.mAlgorithmName.contains("ECGtoHR")) {
+			return true;
+		}
+		if (respSensorDetails!=null && ecgSensorDetails.isEnabled() && abstractAlgorithm.mAlgorithmName.contains("ECGtoHR")) {
 			return true;
 		}
+		
 		return false;
 	}