diff --git a/app/components/entity-chart.js b/app/components/entity-chart.js
index 684a8f7..32a1337 100644
--- a/app/components/entity-chart.js
+++ b/app/components/entity-chart.js
@@ -9,6 +9,11 @@ export default Ember.Component.extend({
 		return properties.objectAt(0);
 	}.property('entity'),
 	
+	entityAvailable: function() {
+		var properties = this.get('entity.properties');
+		return (properties.get('length') > 0);
+	}.property('entity'),
+	
 	actions: {
 		showPropertyValues(_prop) {
 			this.set('visibleProperty', _prop);
diff --git a/app/templates/components/entity-chart.hbs b/app/templates/components/entity-chart.hbs
index 26ea39d..e9212ec 100644
--- a/app/templates/components/entity-chart.hbs
+++ b/app/templates/components/entity-chart.hbs
@@ -1,13 +1,14 @@
-{{#if entity}}
-	<table height="100%">
-		{{#if entityName}}
-			<tr>
-				<th colspan="2">
-						<h2>{{entityName}}</h2>
-				</th>
-			</tr>
-		{{/if}}
+
+<table height="100%">
+	{{#if entityName}}
 		<tr>
+			<th colspan="2">
+					<h2>{{entityName}}</h2>
+			</th>
+		</tr>
+	{{/if}}
+	<tr>
+		{{#if entityAvailable}}
 			<td class="column-left" valign="top">
 				{{property-table model=entity showProperty="showPropertyValues"}}
 			</td>
@@ -22,8 +23,9 @@
 					<h4>{{visibleProperty.type}}</h4>
 				{{/if}}
 			</td>
-		</tr>
-	</table>
-{{else}}
-	<h3>No entitiy found</h3>
-{{/if}}
+		{{else}}
+			<h3>Entity has no attributes</h3>
+		{{/if}}
+	</tr>
+</table>
+