diff --git a/core/um-actions-register.php b/core/um-actions-register.php
index 7bc4d158..5626e92e 100644
--- a/core/um-actions-register.php
+++ b/core/um-actions-register.php
@@ -274,6 +274,8 @@
 			$role = um_get_option('default_role');
 		}
 
+		if( empty( $role ) ) return;
+
 		$role = apply_filters('um_register_hidden_role_field', $role );
 		if( $role ){
 			echo '<input type="hidden" name="role" id="role" value="' . $role . '" />';
diff --git a/core/um-enqueue.php b/core/um-enqueue.php
index 15b8fb40..aed4e0f9 100644
--- a/core/um-enqueue.php
+++ b/core/um-enqueue.php
@@ -52,7 +52,7 @@ class UM_Enqueue {
 			$c_url = $ultimatemember->permalinks->get_current_url( get_option('permalink_structure') );
 
 			foreach( $exclude as $match ) {
-				if ( strstr( $c_url, untrailingslashit( $match ) ) ) {
+				if ( ! empty( $c_url ) && strstr( $c_url, untrailingslashit( $match ) ) ) {
 					return;
 				}
 			}