diff --git a/app/eve_api/templates/eve_api/character.html b/app/eve_api/templates/eve_api/character.html
index b5e94e9..c9f566a 100644
--- a/app/eve_api/templates/eve_api/character.html
+++ b/app/eve_api/templates/eve_api/character.html
@@ -34,6 +34,9 @@
 			<li><span class="stat">Alliance:</span> <span class="value"><a href="http://evemaps.dotlan.net/alliance/{{ character.corporation.alliance.name }}">{{ character.corporation.alliance.name }}</a></span></li>
 			<li><span class="stat">Security Status:</span> {{ character.security_status|floatformat:2 }}</span></li>
 			<li><span class="stat">Director:</span> <span class="value">{{ character.director }}</span></li>
+                        {% if current_training %}
+                        <li><spam class="stat">Training:</span> <span class="Value">{{ current_training.skill.name}} to Level {{ current_training.in_training }}</li>
+                        {% endif %}
 		</ul>
 	</div>
 
diff --git a/app/eve_api/views.py b/app/eve_api/views.py
index 0ac0225..0ae08ee 100644
--- a/app/eve_api/views.py
+++ b/app/eve_api/views.py
@@ -97,7 +97,10 @@ def eveapi_character(request, charid=None):
 
     if charid:
         character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid)
-        current_training = character.eveplayercharacterskill_set.filter(in_training__gt=0)
+        try:
+            current_training = character.eveplayercharacterskill_set.get(in_training__gt=0)
+        except:
+            current_training = None
         skills = character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill__name')
         return render_to_response('eve_api/character.html', locals(), context_instance=RequestContext(request))