Add some checks to Application