Added zero-length and >1 remainder argument checks