diff --git a/src/audio/audiostream.cpp b/src/audio/audiostream.cpp
index 3384794c8c7419cd87c494c04b56f1b713daf601..520443d15741cb267021788087fc17d9f2e99305 100644
--- a/src/audio/audiostream.cpp
+++ b/src/audio/audiostream.cpp
@@ -96,14 +96,14 @@ AudioStream::createStream( pa_context* c )
 				//pa_cvolume_set(&cv, sample_spec.channels , PA_VOLUME_NORM) , NULL );
   }
   else if( _streamType == CAPTURE_STREAM ){
-    
+/*    
     attributes->maxlength = 66500;//-1;
     attributes->tlength = -1; //44100;
     attributes->minreq = 2000;
     attributes->prebuf = 10000;
     attributes->fragsize = -1;   
- 
-    pa_stream_connect_record( s , NULL , attributes /*NULL*/ , PA_STREAM_START_CORKED );
+*/ 
+    pa_stream_connect_record( s , NULL , /*attributes*/ NULL , PA_STREAM_START_CORKED );
   }
   else if( _streamType == UPLOAD_STREAM ){
     pa_stream_connect_upload( s , 1024  );
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index d349b09d547f14f625fc7c10fc8735cf18f92e3d..c6107423007acc01fb6d76646421f9e8ab80b9e2 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -449,6 +449,7 @@ ManagerImpl::initRegisterAccounts()
 {
 
     int status; 
+    bool flag = true;
     AccountMap::iterator iter;
 
     _debugInit("Initiate VoIP Links Registration");
@@ -459,7 +460,8 @@ ManagerImpl::initRegisterAccounts()
         iter->second->loadConfig();
         if ( iter->second->isEnabled() ) {
 	  status = iter->second->registerVoIPLink();
-          ASSERT( status, SUCCESS );
+	  if (status != SUCCESS)
+		flag = false;
         }
       }
       iter++;
@@ -468,6 +470,7 @@ ManagerImpl::initRegisterAccounts()
     if( _audiodriver -> getErrorMessage() != -1 )
       notifyErrClient( _audiodriver -> getErrorMessage() );
     
+    ASSERT( flag, true );
     return SUCCESS;
 }