Changed error message
Added quote functionality