Moved board check to after switch