diff --git a/include/Nazara/Core/ApplicationBase.hpp b/include/Nazara/Core/ApplicationBase.hpp
index 1663a3366..7d529624c 100644
--- a/include/Nazara/Core/ApplicationBase.hpp
+++ b/include/Nazara/Core/ApplicationBase.hpp
@@ -42,10 +42,15 @@ namespace Nz
 			template<typename T> T& GetComponent();
 			template<typename T> const T& GetComponent() const;
 
+			template<typename T> bool HasComponent() const;
+
 			inline void Quit();
 
 			int Run();
 
+			template<typename T> T* TryGetComponent();
+			template<typename T> const T* TryGetComponent() const;
+
 			bool Update(Time elapsedTime);
 
 			ApplicationBase& operator=(const ApplicationBase&) = delete;
diff --git a/include/Nazara/Core/ApplicationBase.inl b/include/Nazara/Core/ApplicationBase.inl
index 5c97fb228..0cdf9ca7b 100644
--- a/include/Nazara/Core/ApplicationBase.inl
+++ b/include/Nazara/Core/ApplicationBase.inl
@@ -75,11 +75,41 @@ namespace Nz
 		return static_cast<const T&>(*m_components[componentIndex]);
 	}
 
+	template<typename T>
+	bool ApplicationBase::HasComponent() const
+	{
+		std::size_t componentIndex = ApplicationComponentRegistry<T>::GetComponentId();
+		if (componentIndex >= m_components.size())
+			return false;
+
+		return m_components[componentIndex] != nullptr;
+	}
+
 	inline void ApplicationBase::Quit()
 	{
 		m_running = false;
 	}
 
+	template<typename T>
+	T* ApplicationBase::TryGetComponent()
+	{
+		std::size_t componentIndex = ApplicationComponentRegistry<T>::GetComponentId();
+		if (componentIndex >= m_components.size())
+			return nullptr;
+
+		return static_cast<T*>(m_components[componentIndex].get());
+	}
+
+	template<typename T>
+	const T* ApplicationBase::TryGetComponent() const
+	{
+		std::size_t componentIndex = ApplicationComponentRegistry<T>::GetComponentId();
+		if (componentIndex >= m_components.size())
+			return nullptr;
+
+		return static_cast<const T*>(m_components[componentIndex].get());
+	}
+
 	inline ApplicationBase* ApplicationBase::Instance()
 	{
 		return s_instance;
@@ -116,3 +146,4 @@ namespace Nz
 }
 
 #include <Nazara/Core/DebugOff.hpp>
+#include "ApplicationBase.hpp"