JKesTable NPE
Code cleanup