diff --git a/src/unresr.f90 b/src/unresr.f90
index f1559d08..520dd57e 100644
--- a/src/unresr.f90
+++ b/src/unresr.f90
@@ -592,6 +592,11 @@ subroutine rdunf2(eunr,scr,arry,jx)
          call ilist(enow,eunr,nunr)
       endif
    enddo
+   if (enow.lt.eh) then
+      write(strng,&
+        '(''between'',1p,e12.4,'' and'',1p,e12.4,'' eV'')') enow, eh
+      call error('rdunf2','energy dependent data undefined',strng) 
+   endif
    ! loop over l states
    do l=1,nls
       call contio(nendf,0,0,scr,nb,nw)
@@ -669,12 +674,17 @@ subroutine rdunf2(eunr,scr,arry,jx)
             enddo
             inow=inow+6
             ! add to list of energy nodes
+            enow=sigfig(scr(jnow+1),7,0)
             if (n.ne.1.and.n.ne.ne.and.l.eq.1.and.j.eq.1) then
-               enow=sigfig(scr(jnow+1),7,0)
                call ilist(enow,eunr,nunr)
             endif
             jnow=jnow+6
          enddo
+         if (enow.lt.eh) then
+            write(strng,&
+              '(''between'',1p,e12.4,'' and'',1p,e12.4,'' eV'')') enow, eh
+            call error('rdunf2','energy dependent data undefined',strng) 
+         endif
       enddo
    enddo
    if (inow.gt.jx) call error('rdunf2','storage exceeded.',' ')
diff --git a/src/vers.f90 b/src/vers.f90
index 4cad8bdc..abf89ab6 100644
--- a/src/vers.f90
+++ b/src/vers.f90
@@ -3,7 +3,7 @@ module version
    ! These values are updated during the NJOY revision-control process.
    implicit none
    private
-   character(8),public::vers='2016.38'
-   character(8),public::vday='18Jun18'
+   character(8),public::vers='2016.39'
+   character(8),public::vday='03Jul18'
 end module version