Index: /home/sakai24/svn_upv/svn_upv/sitestats-trunk/sitestats-impl/src/java/org/sakaiproject/sitestats/impl/StatsUpdateManagerImpl.java
===================================================================
--- /home/sakai24/svn_upv/svn_upv/sitestats-trunk/sitestats-impl/src/java/org/sakaiproject/sitestats/impl/StatsUpdateManagerImpl.java	(revision 54374)
+++ /home/sakai24/svn_upv/svn_upv/sitestats-trunk/sitestats-impl/src/java/org/sakaiproject/sitestats/impl/StatsUpdateManagerImpl.java	(working copy)
@@ -607,9 +607,19 @@
 				c.add(Expression.eq("date", eUpdate.getDate()));
 				try{
 					eExisting = (EventStat) c.uniqueResult();
-				}catch(Exception ex){
-					LOG.debug("More than 1 result when unique result expected.", ex);
-					eExisting = (EventStat) c.list().get(0);
+				}catch(HibernateException ex){
+					List events = c.list();
+					if ((events!=null) && (events.size()>0)){
+						LOG.debug("More than 1 result when unique result expected.", ex);
+						eExisting = (EventStat) c.list().get(0);
+					}else{
+						LOG.debug("No result found", ex);
+						eExisting = null;
+					}
+				}catch(Exception ex2){
+					LOG.debug("Probably ddbb error when loading data at java object", ex2);
+					System.out.println("Probably ddbb error when loading data at java object!!!!!!!!");
+					
 				}
 				if(eExisting == null) 
 					eExisting = eUpdate;
@@ -642,9 +652,19 @@
 				c.add(Expression.eq("date", eUpdate.getDate()));
 				try{
 					eExisting = (ResourceStat) c.uniqueResult();
-				}catch(Exception ex){
-					LOG.debug("More than 1 result when unique result expected.", ex);
-					eExisting = (ResourceStat) c.list().get(0);
+				}catch(HibernateException ex){
+					List events = c.list();
+					if ((events!=null) && (events.size()>0)){
+						LOG.debug("More than 1 result when unique result expected.", ex);
+						eExisting = (ResourceStat) c.list().get(0);
+					}else{
+						LOG.debug("No result found", ex);
+						eExisting = null;
+					}
+				}catch(Exception ex2){
+					LOG.debug("Probably ddbb error when loading data at java object", ex2);
+					System.out.println("Probably ddbb error when loading data at java object!!!!!!!!");
+					
 				}
 				if(eExisting == null) 
 					eExisting = eUpdate;
@@ -674,9 +694,19 @@
 				c.add(Expression.eq("date", eUpdate.getDate()));
 				try{
 					eExisting = (SiteActivity) c.uniqueResult();
-				}catch(Exception ex){
-					LOG.debug("More than 1 result when unique result expected.", ex);
-					eExisting = (SiteActivity) c.list().get(0);
+				}catch(HibernateException ex){
+					List events = c.list();
+					if ((events!=null) && (events.size()>0)){
+						LOG.debug("More than 1 result when unique result expected.", ex);
+						eExisting = (SiteActivity) c.list().get(0);
+					}else{
+						LOG.debug("No result found", ex);
+						eExisting = null;
+					}
+				}catch(Exception ex2){
+					LOG.debug("Probably ddbb error when loading data at java object", ex2);
+					System.out.println("Probably ddbb error when loading data at java object!!!!!!!!");
+					
 				}
 				if(eExisting == null) 
 					eExisting = eUpdate;
@@ -706,9 +736,19 @@
 				c.add(Expression.eq("date", eUpdate.getDate()));
 				try{
 					eExisting = (SiteVisits) c.uniqueResult();
-				}catch(Exception ex){
-					LOG.debug("More than 1 result when unique result expected.", ex);
-					eExisting = (SiteVisits) c.list().get(0);
+				}catch(HibernateException ex){
+					List events = c.list();
+					if ((events!=null) && (events.size()>0)){
+						LOG.debug("More than 1 result when unique result expected.", ex);
+						eExisting = (SiteVisits) c.list().get(0);
+					}else{
+						LOG.debug("No result found", ex);
+						eExisting = null;
+					}
+				}catch(Exception ex2){
+					LOG.debug("Probably ddbb error when loading data at java object", ex2);
+					System.out.println("Probably ddbb error when loading data at java object!!!!!!!!");
+					
 				}
 				if(eExisting == null){
 					eExisting = eUpdate;