Added handler for empty params