diff --git a/fem/src/DefUtils.F90 b/fem/src/DefUtils.F90
index 37c085969b..70f672d2b8 100644
--- a/fem/src/DefUtils.F90
+++ b/fem/src/DefUtils.F90
@@ -919,6 +919,9 @@ SUBROUTINE GetScalarLocalEigenmode( x,name,UElement,USolver,NoEigen,ComplexPart
      END IF
      n = MIN( n, SIZE(x) )
 
+     IF (SIZE(Variable % EigenVectors,1) < NoEigen) THEN
+       CALL Fatal('GetScalarLocalEigenmode', 'Less eigenfunctions available than requested')
+     END IF
      Values => Variable % EigenVectors( NoEigen, :)
 
      IF ( ASSOCIATED( Variable % Perm ) ) THEN
@@ -985,6 +988,9 @@ SUBROUTINE GetVectorLocalEigenmode( x,name,UElement,USolver,NoEigen,ComplexPart
      END IF
      n = MIN( n, SIZE(x) )
 
+     IF (SIZE(Variable % EigenVectors,1) < NoEigen) THEN
+       CALL Fatal('GetVectorLocalEigenmode', 'Less eigenfunctions available than requested')
+     END IF
      Values => Variable % EigenVectors( NoEigen, : )
 
      DO i=1,Variable % DOFs
diff --git a/fem/src/SOLVER.KEYWORDS b/fem/src/SOLVER.KEYWORDS
index 594476a95b..014929c6b7 100644
--- a/fem/src/SOLVER.KEYWORDS
+++ b/fem/src/SOLVER.KEYWORDS
@@ -1288,7 +1288,6 @@ Solver:Real:        'Curvature Diffusion'
 Solver:Real:        'Desired Heating Power'
 Solver:Real:        'Dot Product Tolerance'
 Solver:Real:        'Drilling Stabilization Parameter'
-Solver:Real:        'Eigen  System Convergence Tolerance'
 Solver:Real:        'Eigen System Convergence Tolerance'
 Solver:Real:        'Eigen System Shift'
 Solver:Real:        'Eigen System Shifting Constant'