#PS-1936 #comment added try/catch