diff --git a/Code/IO/otbPointSetFileReader.h b/Code/IO/otbPointSetFileReader.h
index b93fe23053915105b541953ca39c2b0f6cd6145b..35583ae006878d0da496931f3d4736d5a14605ce 100644
--- a/Code/IO/otbPointSetFileReader.h
+++ b/Code/IO/otbPointSetFileReader.h
@@ -73,6 +73,7 @@ template<class TOutputPointSet>
     void TestFileExistanceAndReadability();
     
     std::string m_FileName; // The file to be read
+    long int m_NumberOfPoints;
     
   private:
     PointSetFileReader(const Self&); //purposely not implemented
diff --git a/Code/IO/otbPointSetFileReader.txx b/Code/IO/otbPointSetFileReader.txx
index dc5121a0ff163b43f5040b2bcf7565f581087104..709e6d729884875e1624dc998a71ce277055c390 100644
--- a/Code/IO/otbPointSetFileReader.txx
+++ b/Code/IO/otbPointSetFileReader.txx
@@ -33,6 +33,7 @@ namespace otb
       PointSetFileReader<TOutputPointSet>
   ::PointSetFileReader() : otb::PointSetSource<TOutputPointSet>()
   {
+    m_NumberOfPoints=-1;
   }
   
   template <class TOutputPointSet>
@@ -83,7 +84,8 @@ namespace otb
     std::cout << "Signature: " << header.GetFileSignature() << std::endl;
     std::cout << "Points count: " << header.GetPointRecordsCount() << std::endl;
 
-  
+    m_NumberOfPoints = header.GetPointRecordsCount();
+    
   
   }
   
@@ -97,7 +99,7 @@ namespace otb
     if( ! itksys::SystemTools::FileExists( m_FileName.c_str() ) )
     {
       itk::ImageFileReaderException e(__FILE__, __LINE__);
-      OStringStream msg;
+      itk::OStringStream msg;
       msg <<"The file doesn't exist. "
           << std::endl << "Filename = " << m_FileName
           << std::endl;
@@ -112,7 +114,7 @@ namespace otb
     if( readTester.fail() )
     {
       readTester.close();
-      OStringStream msg;
+      itk::OStringStream msg;
       msg <<"The file couldn't be opened for reading. "
           << std::endl << "Filename: " << m_FileName
           << std::endl;
@@ -130,7 +132,7 @@ namespace otb
   {
   
 
-    typename TOutputImage::Pointer output = this->GetOutput();
+    typename TOutputPointSet::Pointer output = this->GetOutput();
   
   
   }
@@ -142,16 +144,7 @@ namespace otb
   ::PrintSelf(std::ostream& os, itk::Indent indent) const
   {
     Superclass::PrintSelf(os, indent);
-
-    if (this->->GetOutput())
-    {
-      os << indent << "Number of points: " << this->->GetOutput()->GetNumberOfPoints() << std::endl;
-    }
-    else
-    {
-      os << indent << "Output: (null)" << "\n";
-    }
-
+    os << indent << "Number of points: " << this->m_NumberOfPoints << std::endl;
     os << indent << "m_FileName: " << this->m_FileName << "\n";
   }
   
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 9aee3ecb29860581a196570d9c5ed8c3f2d46d55..f838a212fd4d831d1fb58dbf041a22dbf58cb7ba 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -1582,15 +1582,15 @@ ADD_TEST(ioTvImageFileReaderTIF2RADCI4 ${IO_TESTS16}
 #        ${TEMP}/ioImageFileReaderPNG2RADPHA.rad )
 
 
-ADD_TEST(ioTuPointSetFileReaderNew ${IO_TESTS15} 
+ADD_TEST(ioTuPointSetFileReaderNew ${IO_TESTS16} 
         otbPointSetFileReaderNew )
 
-ADD_TEST(ioTvPointSetFileReader ${IO_TESTS15} 
+ADD_TEST(ioTvPointSetFileReader ${IO_TESTS16} 
         --compare-ascii ${TOL}  ${BASELINE_FILES}/ioPointSetFileReader.txt
                         ${TEMP}/ioPointSetFileReader.txt
         otbPointSetFileReader
   ${INPUTDATA}/lidar.las
-  ${TEMP}/ioPointSetFileReader.txt)        
+  ${TEMP}/ioPointSetFileReader.txt)
         
   
 #----------------------------------------------------------------------------------
diff --git a/Testing/Code/IO/otbIOTests16.cxx b/Testing/Code/IO/otbIOTests16.cxx
index 3b14ec8a34824cf1aad0f7722ca0e505b33aeebd..e960868109153399a997355094ce92c887f2b359 100644
--- a/Testing/Code/IO/otbIOTests16.cxx
+++ b/Testing/Code/IO/otbIOTests16.cxx
@@ -35,4 +35,6 @@ REGISTER_TEST(otbImageFileReaderRADFloat);
 REGISTER_TEST(otbImageFileReaderRADComplexDouble);
 REGISTER_TEST(otbImageFileReaderRADComplexFloat);
 REGISTER_TEST(otbImageFileReaderRADComplexInt);
+REGISTER_TEST(otbPointSetFileReaderNew);
+REGISTER_TEST(otbPointSetFileReader);
 }