Catching oef and null token now. This needs probably more fixes
in several other files. #MMAP-5 Fixed
Was basically the same issue #MMAP-2 Fixed