Add error checking for filename/folder names