diff --git a/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java b/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java
index 018ecd51e8..634eae8ffc 100644
--- a/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java
+++ b/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java
@@ -89,22 +89,24 @@ public class MediaBroadcast extends HttpServletCM
 					} else {
 						response.setContentType(thisMedia.getMediaType());
 						// Binary / Image content will get handled here
-						MImage thisImage = thisMedia.getImage();
-						response.setContentLength(thisImage.getData().length);
-						
-						// Open the file and output streams
-						byte[] buffer = thisImage.getData();
-						ByteArrayInputStream in = new ByteArrayInputStream(buffer);
-				        OutputStream out = response.getOutputStream();
-				    
-				        // Copy the contents of the file to the output stream
-				        byte[] buf = new byte[1024];
-				        int count = 0;
-				        while ((count = in.read(buf)) >= 0) {
-				            out.write(buf, 0, count);
-				        }
-				        in.close();
-				        out.close();
+						MImage thisImage = thisMedia.getImage();
+						if (thisImage != null) {
+							response.setContentLength(thisImage.getData().length);
+
+							// Open the file and output streams
+							byte[] buffer = thisImage.getData();
+							ByteArrayInputStream in = new ByteArrayInputStream(buffer);
+							OutputStream out = response.getOutputStream();
+
+							// Copy the contents of the file to the output stream
+							byte[] buf = new byte[1024];
+							int count = 0;
+							while ((count = in.read(buf)) >= 0) {
+								out.write(buf, 0, count);
+							}
+							in.close();
+							out.close();
+						}
 					}
 				} else {
 					response.sendError(404);