Moved check to the top
Added test for unsafe arg for unquote