s3: Simplify the code a bit: Catch (len==0) early