diff --git a/.travis.yml b/.travis.yml
index 848b3ce..263ee76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 sudo: required
 dist: trusty
diff --git a/Model/Behavior/AuthorizationKeyBehavior.php b/Model/Behavior/AuthorizationKeyBehavior.php
index 638149a..6ddd1b8 100644
--- a/Model/Behavior/AuthorizationKeyBehavior.php
+++ b/Model/Behavior/AuthorizationKeyBehavior.php
@@ -136,7 +136,11 @@ public function beforeDelete(Model $Model, $cascade = true) {
  * @return void
  */
 	public function afterDelete(Model $Model) {
-		$contentId = $this->_deleteTargetData[$Model->alias]['id'];
+		if (isset($this->_deleteTargetData[$Model->alias]['id'])) {
+			$contentId = $this->_deleteTargetData[$Model->alias]['id'];
+		} else {
+			$contentId = null;
+		}
 		$AuthorizationKey = $this->_getModel();
 		$AuthorizationKey->cleanup($Model, $contentId);
 	}
diff --git a/View/Helper/AuthKeyPopupButtonHelper.php b/View/Helper/AuthKeyPopupButtonHelper.php
index 2784a22..5ae675d 100644
--- a/View/Helper/AuthKeyPopupButtonHelper.php
+++ b/View/Helper/AuthKeyPopupButtonHelper.php
@@ -98,7 +98,7 @@ public function popupButton($options) {
 		}
 		$html = '<a  authorization-keys-popup-link frame-id="' . Current::read('Frame.id') . '" ' .
 			'class="' . $options['class'] . '" ' .
-			'url="' . $options['url'] . '" ' .
+			'url="' . rawurlencode($options['url']) . '" ' .
 			'popup-title="' . $options['popup-title'] . '" ' .
 			'popup-label="' . $options['popup-label'] . '" ' .
 			'popup-placeholder="' . $options['popup-placeholder'] . '">' .