diff --git a/src/Services/ProjectSystem/ProjectBuildHelper.php b/src/Services/ProjectSystem/ProjectBuildHelper.php
index 73825f98..d18e1767 100644
--- a/src/Services/ProjectSystem/ProjectBuildHelper.php
+++ b/src/Services/ProjectSystem/ProjectBuildHelper.php
@@ -146,7 +146,7 @@ class ProjectBuildHelper
         $message = $buildRequest->getComment();
         $message .= ' (Project build: '.$buildRequest->getProject()->getName().')';
 
-        foreach ($buildRequest->getBomEntries() as $bom_entry) {
+        foreach ($buildRequest->getPartBomEntries() as $bom_entry) {
             foreach ($buildRequest->getPartLotsForBOMEntry($bom_entry) as $part_lot) {
                 $amount = $buildRequest->getLotWithdrawAmount($part_lot);
                 if ($amount > 0) {
diff --git a/templates/Projects/build/_form.html.twig b/templates/Projects/build/_form.html.twig
index 659a73ff..b6c13fa1 100644
--- a/templates/Projects/build/_form.html.twig
+++ b/templates/Projects/build/_form.html.twig
@@ -18,7 +18,7 @@
     <tbody>
     {% for bom_entry in build_request.bomEntries %}
         {# 1st row basic infos about the BOM entry #}
-        <tr class="{% if buildHelper.bOMEntryBuildable(bom_entry, number_of_builds) %}table-primary{% else %}table-danger{% endif %}">
+        <tr class="{% if bom_entry.part is null or buildHelper.bOMEntryBuildable(bom_entry, number_of_builds) %}table-primary{% else %}table-danger{% endif %}">
             <td style="width: 20px;">
                 <div class="form-check">
                     <input class="form-check-input" type="checkbox" value="" data-multicheck-name="lots_check" required>
@@ -28,6 +28,8 @@
             <td >
                 {% if bom_entry.part %}
                     <b><a target="_blank" href="{{ entity_url(bom_entry.part) }}">{{ bom_entry.part.name }}</a></b> {% if bom_entry.name %}({{ bom_entry.name }}){% endif %}
+                {% else %}
+                    <b>{{ bom_entry.name }}</b>
                 {% endif %}
             </td>
             <td>