fixat ett par nullpointer-fel
Merge branch 'master' of https://github.com/ntlve/it-appen

glömde dra ner ändringar