OPAL-2278 - Made sure the errors are not behind the wizard
Merge pull request #454 from kazoompa/bug-OPAL-2278

OPAL-2278 - Made sure the errors are not behind the wizard