--- a/liboctave/CmplxQRP.cc
+++ b/liboctave/CmplxQRP.cc
@@ -53,6 +53,11 @@
 {
   assert (qr_type != QR::raw);
 
+  tau = 0;
+  work = 0;
+  tmp_data = 0;
+  jpvt = 0;
+
   int m = a.rows ();
   int n = a.cols ();
 
@@ -63,11 +68,12 @@
       return;
     }
 
-  Complex *tmp_data;
   int min_mn = m < n ? m : n;
-  Complex *tau = new Complex[min_mn];
+  tau = new Complex[min_mn];
+
   int lwork = n;
-  Complex *work = new Complex[lwork];
+  work = new Complex[lwork];
+
   int info = 0;
 
   if (m > n)
@@ -78,10 +84,9 @@
   else
     tmp_data = dup (a.data (), a.length ());
 
-
   work = new Complex[n];
-  double *rwork = new double[2*n];
-  int *jpvt = new int[n];
+  rwork = new double[2*n];
+  jpvt = new int[n];
 
   // Clear Pivot vector (code to enforce a certain permutation would
   // go here...)
@@ -89,58 +94,85 @@
   for (int i = 0; i < n; i++)
     jpvt[i] = 0;      
 
-  F77_FCN (zgeqpf, ZGEQPF) (m, n, tmp_data, m, jpvt, tau, work, rwork,
-			    info);
+  F77_XFCN (zgeqpf, ZGEQPF, (m, n, tmp_data, m, jpvt, tau, work, rwork,
+			     info));
 
-  // Form Permutation matrix (if economy is requested, return the
-  // indices only!)
+  delete [] work;
+  work = 0;
 
-  if (qr_type == QR::economy && m > n)
-    {
-      p.resize (1, n, 0.0);
-      for (int j = 0; j < n; j++)
-	p.elem (0, j) = jpvt[j];
-    }
+  delete [] rwork;
+  rwork = 0;
+
+  if (f77_exception_encountered)
+    (*current_liboctave_error_handler) ("unrecoverable error in zgeqpf");
   else
     {
-      p.resize (n, n, 0.0);
+      // Form Permutation matrix (if economy is requested, return the
+      // indices only!)
+
+      if (qr_type == QR::economy && m > n)
+	{
+	  p.resize (1, n, 0.0);
+	  for (int j = 0; j < n; j++)
+	    p.elem (0, j) = jpvt[j];
+	}
+      else
+	{
+	  p.resize (n, n, 0.0);
+	  for (int j = 0; j < n; j++)
+	    p.elem (jpvt[j]-1, j) = 1.0;
+	}
+
+      delete [] jpvt;
+      jpvt = 0;
+
+      volatile int n2;
+
+      if (qr_type == QR::economy && m > n)
+	{
+	  n2 = n;
+	  r.resize (n, n, 0.0);
+	}
+      else
+	{
+	  n2 = m;
+	  r.resize (m, n, 0.0);
+	}
+
       for (int j = 0; j < n; j++)
-	p.elem (jpvt[j]-1, j) = 1.0;
+	{
+	  int limit = j < min_mn-1 ? j : min_mn-1;
+	  for (int i = 0; i <= limit; i++)
+	    r.elem (i, j) = tmp_data[m*j+i];
+	}
+
+      lwork = 32*m;
+      work = new Complex[lwork];
+
+      F77_XFCN (zungqr, ZUNGQR, (m, m, min_mn, tmp_data, m, tau, work,
+				 lwork, info));
+
+      if (f77_exception_encountered)
+	(*current_liboctave_error_handler) ("unrecoverable error in zungqr");
+      else
+	{
+	  q = ComplexMatrix (tmp_data, m, m);
+	  tmp_data = 0;
+	  q.resize (m, n2);
+	}
     }
 
+  delete [] tau;
+  tau = 0;
+
+  delete [] work;
+  work = 0;
+
+  delete [] tmp_data;
+  tmp_data = 0;
+
   delete [] jpvt;
-  delete [] work;
-
-  int n2;
-  if (qr_type == QR::economy && m > n)
-    {
-      n2 = n;
-      r.resize (n, n, 0.0);
-    }
-  else
-    {
-      n2 = m;
-      r.resize (m, n, 0.0);
-    }
-
-  for (int j = 0; j < n; j++)
-    {
-      int limit = j < min_mn-1 ? j : min_mn-1;
-      for (int i = 0; i <= limit; i++)
-	r.elem (i, j) = tmp_data[m*j+i];
-    }
-
-  lwork = 32*m;
-  work = new Complex[lwork];
-
-  F77_FCN (zungqr, ZUNGQR) (m, m, min_mn, tmp_data, m, tau, work,
-			    lwork, info);
-
-  q = ComplexMatrix (tmp_data, m, m);
-  q.resize (m, n2);
-
-  delete [] tau;
-  delete [] work;
+  jpvt = 0;
 }
 
 /*