Removing goto statement

Signed-off-by: Michel Verbraak <info@1st-setup.nl>