Quote support & error checking
Signed-off-by: swicks <swicks@devicesoftware.com>