diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
index 9bd094ecc4..f83ae083a9 100644
--- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html
+++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html
@@ -83,6 +83,19 @@
 			<dd><a href="{% url 'target' build.pk target.target.pk %}">{{target.npkg}}</a></dd>
 			<dt>Total package size</dt>
 			<dd>{{target.pkgsz|filtered_filesizeformat}}</dd>
+                        {% if target.targetHasNoImages %}
+                        <div class="alert alert-info">
+                          <p>
+                            <b>This build did not create any image files</b>
+                          </p>
+                          <p>
+                            This is probably because valid image and license manifest
+                            files from a previous build already exist in your
+                            .../poky/build/tmp/deploy directory. You can also <b>view the
+                              license manifest information</b> in Toaster.
+                          </p>
+                        </div>
+                        {% else %}
 			<dt>
 				<i class="icon-question-sign get-help" title="The location in disk of the license manifest, a document listing all packages installed in your image and their licenses"></i>
 				<a href="{% url 'targetpkg' build.pk target.target.pk %}">License manifest</a>
@@ -100,10 +113,12 @@
                                   {% endfor %}
 				</ul>
 			</dd>
+                        {% endif %}
 		</dl>
 	</div>
         {% endif %}
 	{% endfor %}
+
   {% endif %}
 </div>
 
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 6de448596a..68e981a50e 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -402,6 +402,7 @@ def builddashboard( request, build_id ):
     targets = [ ]
     ntargets = 0
     hasImages = False
+    targetHasNoImages = False
     for t in tgts:
         elem = { }
         elem[ 'target' ] = t
@@ -428,7 +429,11 @@ def builddashboard( request, build_id ):
                 ndx = 0;
             f = i.file_name[ ndx + 1: ]
             imageFiles.append({ 'path': f, 'size' : i.file_size })
+        if ( t.is_image and 
+             (( len( imageFiles ) <= 0 ) or ( len( t.license_manifest_path ) <= 0 ))):
+            targetHasNoImages = True
         elem[ 'imageFiles' ] = imageFiles
+        elem[ 'targetHasNoImages' ] = targetHasNoImages
         targets.append( elem )
 
     ##