ERT-643 Reordering of Splash screen code and additional checking