bugfix NullPointerException
Merge branch 'sprint1' of https://github.com/TestingTechnologies/PlayCustomParameters into sprint1
merge