diff --git a/src/BaseObject.php b/src/BaseObject.php
index 1a23408ba1..4a6fa12d24 100644
--- a/src/BaseObject.php
+++ b/src/BaseObject.php
@@ -28,7 +28,7 @@ class BaseObject
 	public static function getApp()
 	{
 		if (empty(self::$app)) {
-			throw new InternalServerErrorException('App isn\' initialized.');
+			throw new InternalServerErrorException('App isn\'t initialized.');
 		}
 
 		return self::$app;
diff --git a/tests/src/BaseObjectTest.php b/tests/src/BaseObjectTest.php
index 2dbf5580f6..b2c73780a4 100644
--- a/tests/src/BaseObjectTest.php
+++ b/tests/src/BaseObjectTest.php
@@ -31,10 +31,6 @@ class BaseObjectTest extends TestCase
 	 */
 	protected function setUp()
 	{
-		$this->setUpVfsDir();
-		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
-		$this->mockApp($this->root, $configMock);
-
 		$this->baseObject = new BaseObject();
 	}
 
@@ -44,6 +40,10 @@ class BaseObjectTest extends TestCase
 	 */
 	public function testGetApp()
 	{
+		$this->setUpVfsDir();
+		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$this->mockApp($this->root, $configMock);
+
 		$this->assertInstanceOf(App::class, $this->baseObject->getApp());
 	}
 
@@ -53,7 +53,20 @@ class BaseObjectTest extends TestCase
 	 */
 	public function testSetApp()
 	{
+		$this->setUpVfsDir();
+		$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
+		$this->mockApp($this->root, $configMock);
+
 		$this->assertNull($this->baseObject->setApp($this->app));
 		$this->assertEquals($this->app, $this->baseObject->getApp());
 	}
+
+	/**
+	 * Test the getApp() function without App
+	 * @expectedException Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public function testGetAppFailed()
+	{
+		BaseObject::getApp();
+	}
 }