Fix for whitespace handling; argument checking.