Added safety check for PSC