Fixed nullpointer i Mainframe