Merge "Check for null layer handles from clients"