Possible fix to nullpointer in tablemanager