diff --git a/e107_handlers/session_handler.php b/e107_handlers/session_handler.php
index 2a8ab582f..0c4ef9724 100644
--- a/e107_handlers/session_handler.php
+++ b/e107_handlers/session_handler.php
@@ -167,7 +167,14 @@ class e_session
 		$this->setOptions(array($key => $value));
 		return $this;
 	}
-	
+
+	public function getOptions()
+	{
+		return $this->_options;
+	}
+
+
+
 	/**
 	 * Get session option
 	 * @param string $key
@@ -416,10 +423,14 @@ class e_session
 				break;
 
 				default:
-					continue;
+					$v = null;
 				break;
 			}
-			$this->_options[$k] = $v;
+
+			if($v !== null)
+			{
+				$this->_options[$k] = $v;
+			}
 		}
 		return $this;
 	}
diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php
index 079570128..10e3d1f8f 100644
--- a/e107_handlers/userclass_class.php
+++ b/e107_handlers/userclass_class.php
@@ -1424,8 +1424,8 @@ class user_class_admin extends user_class
 				  case 'UPDATE' :
 					$this->save_edited_class($tree);
 					break;
-				  default :
-					continue;
+
+
 				}
 			}
 		}