Avoid non-local returns when not necessary

Code is slightly nicer

Signed-off-by: Stefan Marr <git@stefan-marr.de>