diff --git a/app/__init__.py b/app/__init__.py
index 18c3a92..8b2e2ce 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -319,7 +319,7 @@ def delete_pit_stop_form(pid):
 @app.route('/pitstops/edit/<int:pid>', methods=['GET', 'POST'])
 @login_required
 def edit_pit_stop_form(pid):
-    edit_pitstop = Pitstop.query.get(pid).first()
+    edit_pitstop = Pitstop.query.get(pid)
     if edit_pitstop is None:
         return redirect(url_for('get_pit_stops'))
 
@@ -339,14 +339,14 @@ def edit_pit_stop_form(pid):
     if form.validate_on_submit():
         edit_pitstop.costs = form.costs.data
         edit_pitstop.date = form.date.data
-        edit_pitstop.litres = form.litres.data
+        edit_pitstop.amount = form.litres.data
         edit_pitstop.odometer = form.odometer.data
         db.session.commit()
         tools.db_log_update(edit_pitstop)
         return redirect(url_for('get_pit_stops', _anchor='v' + str(vehicle.id)))
 
     form.odometer.default = edit_pitstop.odometer
-    form.litres.default = edit_pitstop.litres
+    form.litres.default = edit_pitstop.amount
     form.date.default = edit_pitstop.date
     form.costs.default = edit_pitstop.costs
     form.process()
@@ -354,7 +354,7 @@ def edit_pit_stop_form(pid):
         'date': 'Date must be between %s and %s (including).' % (str(last_pitstop.date), str(date.today())),
         'odometer': 'Odometer must be greater than %s km.' % (str(last_pitstop.odometer))
     }
-    if edit_pitstop.costs > 0:
+    if edit_pitstop.costs is not None and edit_pitstop.costs > 0:
         messages['costs'] = 'Costs must be higher than 0.01 €.'
     return render_template('editPitStopForm.html', form=form, vehicle=vehicle, messages=messages)