diff --git a/js/dom-functions.js b/js/dom-functions.js
index fd96a34..f70c2d1 100644
--- a/js/dom-functions.js
+++ b/js/dom-functions.js
@@ -488,7 +488,6 @@ function buildProfileCard(data) {
    · · · · · · · · · */
 
 function buildExternalProfileCard(data) {
-
 	// follows me?
 	var follows_you = '';
 	if(data.local !== null && data.local.follows_you === true  && window.loggedIn.id != data.local.id) {
@@ -497,7 +496,7 @@ function buildExternalProfileCard(data) {
 
 	// follow button
 	var followButton = '';
-	if(window.loggedIn !== false && typeof data.local != 'undefined' && data.local !== null) {
+	if(window.loggedIn !== false && typeof data.local != 'undefined' && data.local) {
 		var followButton = buildFollowBlockbutton(data.local);
 		}
 
diff --git a/js/qvitter.js b/js/qvitter.js
index 4372cb3..60877f5 100644
--- a/js/qvitter.js
+++ b/js/qvitter.js
@@ -285,7 +285,6 @@ $('body').on('mouseover',function (e) {
 			possibleNickname = $(e.target).text();
 			}
 		}
-
 	// see if we have it in cache, otherwise query server
 	getUserArrayData(hrefAttr, possibleNickname, timeNow, targetElement, function(userArray, timeOut){
 
@@ -328,9 +327,8 @@ $('body').on('mouseover',function (e) {
 					// we query it for the lastest data
 					if((typeof window.userArrayLastRetrieved[hrefAttr] == 'undefined') || (timeNow - window.userArrayLastRetrieved[hrefAttr]) > 60000) {
 						window.userArrayLastRetrieved[hrefAttr] = timeNow;
-
 						// local users
-						if(userArray.local !== null && userArray.local.is_local === true) {
+						if(userArray.local && userArray.local.is_local === true) {
 							getFromAPI('users/show.json?id=' + userArray.local.screen_name, function(data){
 								if(data) {
 									var newProfileCard = buildProfileCard(data);
@@ -341,7 +339,7 @@ $('body').on('mouseover',function (e) {
 							}
 
 						// external users
-						else if(userArray.local === null || userArray.local.is_local === false) {
+						else if(!userArray.local || userArray.local.is_local === false) {
 							getFromAPI('qvitter/external_user_show.json?profileurl=' + encodeURIComponent(hrefAttr),function(data){
 								if(data && data.external !== null) {
 									var newProfileCard = buildExternalProfileCard(data);