diff --git a/v1/app.py b/v1/app.py
index 87a1aa7..98ec0b6 100755
--- a/v1/app.py
+++ b/v1/app.py
@@ -64,10 +64,10 @@ def bad_request(error):
 @app.route('/api/v1/disks', methods=['GET'])
 @auth.login_required
 def get_diskUsage():
-	
-	if (diskUsage()):
-		return jsonify(diskUsage())
-	else:
+	try:
+		returningDiskUsage = diskUsage(request.args.get('dir'))
+		return jsonify(returningDiskUsage)
+	except:
 		abort(404)
 
 @app.route('/api/v1/disks/<disk_name>', methods=['GET'])