Added null check on platform name