diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index ead8c18fbe..6b1f791101 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -200,6 +200,7 @@
                 <h4 class="modal-title" id="patronImageEditLabel">Patron photo</h4>
             </div>
             <div class="modal-body">
+                [% IF ( patron.cardnumber ) %]
                 <div id="upload-patron-image" class="patroninfo-section">
                     <h5>Upload patron photo</h5>
                     <form method="post" id="picture-upload" action="/cgi-bin/koha/tools/picture-upload.pl"
@@ -277,6 +278,11 @@
                         <span id="camera-error-message"></span>
                     </div>
                 </div>
+                [% ELSE %]
+                    <div id="missing-cardnumber-picture-upload">
+                        <p>The patron must have a cardnumber before a patron photo can be uploaded.</p>
+                    </div>
+                [% END %]
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
index a730bb4732..c3989d98aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
@@ -87,7 +87,7 @@ $(document).ready(function(){
         $("#patronImageEdit").on("hidden.bs.modal", function(){
             /* Stop using the user's camera when modal is closed */
             let viewfinder = document.getElementById("viewfinder");
-            if( viewfinder.srcObject ){
+            if( viewfinder && viewfinder.srcObject ){
                 viewfinder.srcObject.getTracks().forEach( track => {
                     if( track.readyState == 'live' && track.kind === 'video'){
                         track.stop();
diff --git a/koha-tmpl/intranet-tmpl/prog/js/patron-webcam.js b/koha-tmpl/intranet-tmpl/prog/js/patron-webcam.js
index 3fd3e8732b..d75b1a720c 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/patron-webcam.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/patron-webcam.js
@@ -43,6 +43,11 @@ function startup() {
     camera = document.getElementById("camera");
     uploadfiletext = document.getElementById("uploadfiletext");
 
+    if ( ! video ){
+        //If there is no video element, don't try to start up camera
+        return;
+    }
+
     try {
         navigator.mediaDevices.getUserMedia({
             video: true,