changed to bouncer pattern - to match also the rest of the code see https://softwareengineering.stackexchange.com/questions/18454/should-i-return-from-a-function-early-or-use-an-if-statement