Added some error messages and Transit functionality