More safer check