null pointer fix.
table
Merge branch 'master' of https://github.com/madakralc/DAT076.git