1 files changed, 5 insertions, 2 deletions

diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 937aaae..1139bd7 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -42,35 +42,38 @@ void AbLabel::setContacts( const OContactAccess::List& viewList )
                 m_empty = false;
                 m_itCurContact = m_viewList.begin();
                 sync();
         }else{
                 // m_itCurContact.clear();
                 m_empty = true;
                 setText( "" );
         }
 }
 
 int AbLabel::currentEntry_UID()
 {
-        OContact contact = *m_itCurContact;
+        OContact contact = currentEntry();
 
         if ( contact.isEmpty() )
                 return 0;
         else
                 return ( contact.uid() );
 }
 
 OContact AbLabel::currentEntry()
 {
-        return ( *m_itCurContact );
+        if ( ! m_empty )
+                return ( *m_itCurContact );
+        else
+                return OContact();
 }
 
 
 bool AbLabel::selectContact( int UID )
 {
         
         for ( m_itCurContact = m_viewList.begin(); m_itCurContact != m_viewList.end(); ++m_itCurContact){
                 if ( (*m_itCurContact).uid() == UID )
                         break;
         }
         sync();