diff --git a/ocicli/ocicli b/ocicli/ocicli
index b9c112f4373e952f066da68c5b5e901ad18a6fdf..6de43cd147f49f3407ee21dae608002d389533b5 100755
--- a/ocicli/ocicli
+++ b/ocicli/ocicli
@@ -99,7 +99,7 @@ ocicli_call (){
 	if ! [ "${STATUS}" = "success" ] ; then
 		echo "Could not query API:"
 		MESSAGE=$(cat ${API_RESPONSE_FILE} | jq -r '.["message"]')
-		echo $MESSAGE
+		echo "$MESSAGE"
 		rm ${API_RESPONSE_FILE}
 		exit 1
 	fi
@@ -212,7 +212,7 @@ ocicli_machine_list (){
 	fi
 	JQFL=${JQFL}'"'
 
-	echo ${HEAD}
+	echo "${HEAD}"
 	cat ${API_RESPONSE_FILE} | jq -r "${JQFL}"
 #	if [ "${1}" = "-a" ] ; then
 #		echo "serial,Cur_ip,dhcp_ip,memory,status,puppet,lastseen,cluster,location,swiftregion,ladvd,product_name,BIOSver,Lifecycle,IPMIver,IPMI_IP,hostname,notes,dc,row,rack,ustart,uend"