Fixed an error on the landing page, also ensured that errors are propagated correctly