RA-73 Fixing NPE