diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php
index 8bb49d20..60c9e3f0 100644
--- a/inc/caldav-PUT-functions.php
+++ b/inc/caldav-PUT-functions.php
@@ -640,7 +640,7 @@ function do_scheduling_requests( vCalendar $resource, $create, $old_data = null
         $response = '5.2';  // No scheduling support for user
       }
       else {
-        if ($attendee_is_new || !$row) {
+        if ($attendee_is_new || !isset($row)) {
           $this_schedule_request = clone($schedule_request);
           $this_resource = clone($resource);
         } else {
diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php
index 13a02ed0..f7e311e2 100644
--- a/inc/caldav-REPORT-calquery.php
+++ b/inc/caldav-REPORT-calquery.php
@@ -183,7 +183,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
         $subfilter = $v->GetContent();
         if ( is_array( $subfilter ) ) {
           $success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
-          if ( $success === false ) continue; else {
+          if ( $success === false ) continue 2; else {
             $sql .= $success['sql'];
             $params = array_merge( $params, $success['params'] );
           }
@@ -220,12 +220,12 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
             $need_post_filter = true;
             unset($subproperty);
             dbg_error_log("calquery", "Could not handle 'prop-filter' on %s in SQL", $propertyname );
-            continue;
+            continue 3;
         }
         if ( isset($subproperty) ) {
           $subfilter = $v->GetContent();
           $success = SqlFilterFragment( $subfilter, $components, $subproperty, $parameter );
-          if ( $success === false ) continue; else {
+          if ( $success === false ) continue 2; else {
             $sql .= $success['sql'];
             $params = array_merge( $params, $success['params'] );
           }
@@ -238,7 +238,7 @@ function SqlFilterFragment( $filter, $components, $property = null, $parameter =
         $parameter = $v->GetAttribute("name");
         $subfilter = $v->GetContent();
         $success = SqlFilterFragment( $subfilter, $components, $property, $parameter );
-        if ( $success === false ) continue; else {
+        if ( $success === false ) continue 2; else {
           $sql .= $success['sql'];
           $params = array_merge( $params, $success['params'] );
         }