Update to latest AWS API
Fix check for empty integer