added error handling if record is null
Merge branch 'master' of github.com:KosmosOgKaos/ljosanott_theme
merging