diff --git a/IccProfLib/IccMatrixMath.cpp b/IccProfLib/IccMatrixMath.cpp
index 40a7218d1..162708c88 100644
--- a/IccProfLib/IccMatrixMath.cpp
+++ b/IccProfLib/IccMatrixMath.cpp
@@ -356,6 +356,9 @@ bool CIccMatrixMath::SetRange(const icSpectralRange &srcRange, const icSpectralR
   if (m_nRows != dstRange.steps || m_nCols != srcRange.steps)
     return false;
 
+  if (srcRange.steps == 0)
+    return false;
+
   icUInt16Number d;
   icFloatNumber srcStart = icF16toF(srcRange.start);
   icFloatNumber srcEnd = icF16toF(srcRange.end);
@@ -367,7 +370,8 @@ bool CIccMatrixMath::SetRange(const icSpectralRange &srcRange, const icSpectralR
   icFloatNumber dstScale = (dstEnd - dstStart ) / (dstRange.steps - 1);
 
   icFloatNumber *data=entry(0);
-  memset(data, 0, dstRange.steps*srcRange.steps*sizeof(icFloatNumber));
+  size_t dataSize = dstRange.steps * srcRange.steps * sizeof(icFloatNumber);
+  memset(data, 0, dataSize);
 
   for (d=0; d<dstRange.steps; d++) {
     icFloatNumber *r = entry(d);
diff --git a/IccProfLib/IccPcc.cpp b/IccProfLib/IccPcc.cpp
index c60d9c6d7..d7f4bccc6 100644
--- a/IccProfLib/IccPcc.cpp
+++ b/IccProfLib/IccPcc.cpp
@@ -240,6 +240,10 @@ icFloatNumber *IIccProfileConnectionConditions::getEmissiveObserver(const icSpec
 
   icSpectralRange observerRange;
   const icFloatNumber *observer = pView->getObserver(observerRange);
+  
+  // we can't do any calculations with this (non)observer
+  if (!observer || observerRange.steps == 0)
+    return NULL;
 
   if (!obs)
     obs = (icFloatNumber*)malloc(size*sizeof(icFloatNumber));