diff --git a/library/platform_util.c b/library/platform_util.c
index 6ba4112fb..9461a9c73 100644
--- a/library/platform_util.c
+++ b/library/platform_util.c
@@ -150,7 +150,17 @@ uint32_t mbedtls_platform_random_in_range( size_t num )
 
     mbedtls_hardware_poll( NULL, (unsigned char *) &result, sizeof( result ),
                            &olen );
-    return( result % num );
+
+    if( num == 0 )
+    {
+        result = 0;
+    }
+    else
+    {
+        result %= num;
+    }
+
+    return( result );
 #endif
 }