Minor additional check when loading