Added null check for when .get on models tests for existance of key values